diff options
| author | Spandan Das <spandandas@google.com> | 2024-02-29 19:54:28 +0000 |
|---|---|---|
| committer | Spandan Das <spandandas@google.com> | 2024-03-04 07:57:59 +0000 |
| commit | 614a6f2b41af284e6238ff8005ffc39c9049128e (patch) | |
| tree | 31f9c96ea694297b01bdb6c3903327ca7dde7852 | |
| parent | a8afdcb3072096d5c76243bf342a98be5f8b9e89 (diff) | |
Use BaseModuleName for LOCAL_MODULE
This CL uses OverrideName to ensure that the LOCAL_MODULE does not
contain any version information.
Test: Created CaptiveLoginPortalGoogle.v2, and checked that its
LOCAL_MODULE is CaptiveLoginPortalGoogle
Change-Id: I177441bcd55ca538759b69aafb73d0a8b7261179
| -rw-r--r-- | java/androidmk.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/java/androidmk.go b/java/androidmk.go index b7df9bf9e..498962f88 100644 --- a/java/androidmk.go +++ b/java/androidmk.go @@ -691,9 +691,10 @@ func (a *AndroidAppImport) AndroidMkEntries() []android.AndroidMkEntries { return nil } return []android.AndroidMkEntries{android.AndroidMkEntries{ - Class: "APPS", - OutputFile: android.OptionalPathForPath(a.outputFile), - Include: "$(BUILD_SYSTEM)/soong_app_prebuilt.mk", + Class: "APPS", + OutputFile: android.OptionalPathForPath(a.outputFile), + OverrideName: a.BaseModuleName(), // TODO (spandandas): Add a test + Include: "$(BUILD_SYSTEM)/soong_app_prebuilt.mk", ExtraEntries: []android.AndroidMkExtraEntriesFunc{ func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) { entries.SetBoolIfTrue("LOCAL_PRIVILEGED_MODULE", a.Privileged()) |