Set LOCAL_APKCERTS_FILE for apk_set modules in apexes am: 7e2b36c7d5

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

Change-Id: Ic998c65cef64775335eeafb019372b1d4870701d
This commit is contained in:
Colin Cross
2020-07-10 04:41:58 +00:00
committed by Automerger Merge Worker
2 changed files with 5 additions and 0 deletions

View File

@@ -200,6 +200,7 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, apexBundleName, apexName, mo
panic(fmt.Sprintf("Expected %s to be AndroidAppSet", fi.module))
}
fmt.Fprintln(w, "LOCAL_APK_SET_MASTER_FILE :=", as.MasterFile())
fmt.Fprintln(w, "LOCAL_APKCERTS_FILE :=", as.APKCertsFile().String())
fmt.Fprintln(w, "include $(BUILD_SYSTEM)/soong_android_app_set.mk")
case nativeSharedLib, nativeExecutable, nativeTest:
fmt.Fprintln(w, "LOCAL_MODULE_STEM :=", fi.Stem())

View File

@@ -105,6 +105,10 @@ func (as *AndroidAppSet) MasterFile() string {
return as.masterFile
}
func (as *AndroidAppSet) APKCertsFile() android.Path {
return as.apkcertsFile
}
var TargetCpuAbi = map[string]string{
"arm": "ARMEABI_V7A",
"arm64": "ARM64_V8A",