diff options
| author | Spandan Das <spandandas@google.com> | 2024-03-04 07:59:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-03-04 07:59:06 +0000 |
| commit | 1c96fab7d06699d2c14a8ee1e67a01674b4007cf (patch) | |
| tree | 738bdcb3eb2c8153867f709b4efcde091375412d /java/androidmk.go | |
| parent | 0684c5fc1140190e70fee99d51f12c1d31b859ea (diff) | |
| parent | 614a6f2b41af284e6238ff8005ffc39c9049128e (diff) | |
Merge changes I177441bc,I32daefbd into main
* changes:
Use BaseModuleName for LOCAL_MODULE
Disable source javalib dexpreopt when using prebuilt apex
Diffstat (limited to 'java/androidmk.go')
| -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()) |