aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2019-04-03 07:23:30 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-04-03 07:23:30 -0700
commitbf9f355f8d49ccbbc9588af1de4a71d76e720922 (patch)
treeb9a1fe71949c3d0910b34ac3a0f4fca2f95f7961 /java
parent2a5d962ab816bfe0d8daf58480918f9823b662ee (diff)
parentc2c2824ff918048133b9f6ba2f945d7e46a19ca3 (diff)
downloadbuild_soong-bf9f355f8d49ccbbc9588af1de4a71d76e720922.tar.gz
build_soong-bf9f355f8d49ccbbc9588af1de4a71d76e720922.tar.bz2
build_soong-bf9f355f8d49ccbbc9588af1de4a71d76e720922.zip
Merge "Fix panic when missing hiddenapi jar" am: f5df780fc2 am: f5a8e0e88d
am: c2c2824ff9 Change-Id: I358685842ca77c435a02b52bf2b278a841a51808
Diffstat (limited to 'java')
-rw-r--r--java/hiddenapi_singleton.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/hiddenapi_singleton.go b/java/hiddenapi_singleton.go
index 139114b3..9627dc64 100644
--- a/java/hiddenapi_singleton.go
+++ b/java/hiddenapi_singleton.go
@@ -159,9 +159,9 @@ func stubFlagsRule(ctx android.SingletonContext) {
for moduleList, pathList := range moduleListToPathList {
for i := range pathList {
if pathList[i] == nil {
+ pathList[i] = android.PathForOutput(ctx, "missing")
if ctx.Config().AllowMissingDependencies() {
missingDeps = append(missingDeps, (*moduleList)[i])
- pathList[i] = android.PathForOutput(ctx, "missing")
} else {
ctx.Errorf("failed to find dex jar path for module %q",
(*moduleList)[i])