diff options
| author | Colin Cross <ccross@android.com> | 2020-07-09 19:05:35 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2020-07-09 19:05:35 -0700 |
| commit | 7e2b36c7d59b1939d3ff1be79bd846a882e75bf7 (patch) | |
| tree | dd24ba54e26fdc6b83e9365570d0417858d31723 | |
| parent | 03f3a9c1466f85105d3eba813a2b3ebbb96b402f (diff) | |
| download | build_soong-7e2b36c7d59b1939d3ff1be79bd846a882e75bf7.tar.gz build_soong-7e2b36c7d59b1939d3ff1be79bd846a882e75bf7.tar.bz2 build_soong-7e2b36c7d59b1939d3ff1be79bd846a882e75bf7.zip | |
Set LOCAL_APKCERTS_FILE for apk_set modules in apexes
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
| -rw-r--r-- | apex/androidmk.go | 1 | ||||
| -rwxr-xr-x | java/app.go | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/apex/androidmk.go b/apex/androidmk.go index 884a4e81..e299588a 100644 --- a/apex/androidmk.go +++ b/apex/androidmk.go @@ -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()) diff --git a/java/app.go b/java/app.go index a0b208f7..5af89b9c 100755 --- a/java/app.go +++ b/java/app.go @@ -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", |