diff options
| author | 2021-11-12 12:19:42 -0800 | |
|---|---|---|
| committer | 2021-11-17 19:55:33 -0800 | |
| commit | ffbcd1d8a086c581a14a42e54fa0019c637f56e6 (patch) | |
| tree | d4651575c734aa5fd9fd0d9b0bd20ca95ab22d0a /java/androidmk.go | |
| parent | 6cfb37af5672c419af04131c48accbea2168f9bd (diff) | |
Extract primary apk from apk set zip
Extract and install the primary apk normally, and then unzip the rest
of them as a post install command.
Bug: 204136549
Test: app_set_test.go
Change-Id: I17437ff27f49df6bc91bdbbea6173b46c7d3ec4e
Diffstat (limited to 'java/androidmk.go')
| -rw-r--r-- | java/androidmk.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/androidmk.go b/java/androidmk.go index 4c115d58c..272a4fd36 100644 --- a/java/androidmk.go +++ b/java/androidmk.go @@ -696,12 +696,12 @@ func (apkSet *AndroidAppSet) AndroidMkEntries() []android.AndroidMkEntries { return []android.AndroidMkEntries{ android.AndroidMkEntries{ Class: "APPS", - OutputFile: android.OptionalPathForPath(apkSet.packedOutput), + OutputFile: android.OptionalPathForPath(apkSet.primaryOutput), Include: "$(BUILD_SYSTEM)/soong_android_app_set.mk", ExtraEntries: []android.AndroidMkExtraEntriesFunc{ func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) { entries.SetBoolIfTrue("LOCAL_PRIVILEGED_MODULE", apkSet.Privileged()) - entries.SetString("LOCAL_APK_SET_INSTALL_FILE", apkSet.InstallFile()) + entries.SetPath("LOCAL_APK_SET_INSTALL_FILE", apkSet.PackedAdditionalOutputs()) entries.SetPath("LOCAL_APKCERTS_FILE", apkSet.apkcertsFile) entries.AddStrings("LOCAL_OVERRIDES_PACKAGES", apkSet.properties.Overrides...) }, |