summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2020-07-09 19:05:35 -0700
committer Colin Cross <ccross@android.com> 2020-07-10 20:38:50 -0700
commit4fb652d6812a7c595f6ebf46f6e04bac68035486 (patch)
treee41bedb5c426a3ab1f198b94b3d8963b53de5199 /java
parent0ae555df1a5b0fc86a6fa83c1de42026ef184cd2 (diff)
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 Merged-In: I1ccaafd04978374d0da10363a1d782cfeae428e7 (cherry picked from commit 7e2b36c7d59b1939d3ff1be79bd846a882e75bf7)
Diffstat (limited to 'java')
-rwxr-xr-xjava/app.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/java/app.go b/java/app.go
index 98bce9471..4071c0a7f 100755
--- a/java/app.go
+++ b/java/app.go
@@ -106,6 +106,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",