diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-07-11 01:01:50 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-07-11 01:01:50 +0000 |
| commit | 0f75d1dd1dbcebc8f4657560e896b308e970a2d8 (patch) | |
| tree | dd24ba54e26fdc6b83e9365570d0417858d31723 | |
| parent | c6eadab94c309a6fdda6247bf2b87cef39566bcd (diff) | |
| parent | 7e2b36c7d59b1939d3ff1be79bd846a882e75bf7 (diff) | |
| download | build_soong-0f75d1dd1dbcebc8f4657560e896b308e970a2d8.tar.gz build_soong-0f75d1dd1dbcebc8f4657560e896b308e970a2d8.tar.bz2 build_soong-0f75d1dd1dbcebc8f4657560e896b308e970a2d8.zip | |
Snap for 6671561 from 7e2b36c7d59b1939d3ff1be79bd846a882e75bf7 to rvc-release
Change-Id: I549ea712b591e7eb6e25e5b0e872ba5831e92e5e
| -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", |