Merge "Set LOCAL_APKCERTS_FILE for apk_set modules in apexes"
diff --git a/apex/androidmk.go b/apex/androidmk.go
index 7595238..156906d 100644
--- a/apex/androidmk.go
+++ b/apex/androidmk.go
@@ -203,6 +203,7 @@
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())
diff --git a/java/app.go b/java/app.go
index 98bce94..4071c0a 100755
--- a/java/app.go
+++ b/java/app.go
@@ -106,6 +106,10 @@
return as.masterFile
}
+func (as *AndroidAppSet) APKCertsFile() android.Path {
+ return as.apkcertsFile
+}
+
var TargetCpuAbi = map[string]string{
"arm": "ARMEABI_V7A",
"arm64": "ARM64_V8A",