StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Output apkcerts file for android_app_set." into rvc-dev am: d8f1b81e75

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12041704

Change-Id: I39f867293f232116148b0a0ced65754cf70465a5
This commit is contained in:
Jaewoong Jung
2020-07-01 00:23:47 +00:00
committed by Automerger Merge Worker
parent 62783652ac d8f1b81e75
commit e37779d23f
6 changed files with 75 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
java/androidmk.go
View File

@@ -719,6 +719,7 @@ func (apkSet *AndroidAppSet) AndroidMkEntries() []android.AndroidMkEntries {
func(entries *android.AndroidMkEntries) {
entries.SetBoolIfTrue("LOCAL_PRIVILEGED_MODULE", apkSet.Privileged())
entries.SetString("LOCAL_APK_SET_MASTER_FILE", apkSet.masterFile)
entries.SetPath("LOCAL_APKCERTS_FILE", apkSet.apkcertsFile)
entries.AddStrings("LOCAL_OVERRIDES_PACKAGES", apkSet.properties.Overrides...)
},
},