tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Set LOCAL_APKCERTS_FILE for apk_set modules in apexes

Browse source 
I321e80fd636a955213761f56a3ac64bfe7f7f7c0 missed setting
LOCAL_APKCERTS_FILE for apk_set modules in apexes, which causes
invalid apkcerts.txt files.

Bug: 160652723
Test: m apkcerts-list
Change-Id: I1ccaafd04978374d0da10363a1d782cfeae428e7
Merged-In: I1ccaafd04978374d0da10363a1d782cfeae428e7
(cherry picked from commit 7e2b36c7d5)
This commit is contained in:
Colin Cross 2020-07-09 19:05:35 -07:00
parent 0ae555df1a
commit 4fb652d681
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apex/androidmk.go
View file

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

4
java/app.go
View file

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