summaryrefslogtreecommitdiff
path: root/java/java.go
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2021-05-07 08:24:06 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2021-05-07 08:24:06 +0000
commitc76155cd71c50158b3c1e374babb8d2baa510363 (patch)
tree0dba5a8d15f89ef4b3878643000295ae779122dd /java/java.go
parentd91c75ca097051e866e0bc9ab9f286d557aa9d27 (diff)
parentb17d04462867ac735a4c1b86e81115e1179c90ef (diff)
Merge "Transitively add APEX variants for contents of prebuilt_apex/apex_set"
Diffstat (limited to 'java/java.go')
-rw-r--r--java/java.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/java/java.go b/java/java.go
index 7258dcefd..9896b578a 100644
--- a/java/java.go
+++ b/java/java.go
@@ -1296,9 +1296,10 @@ func (j *Import) GenerateAndroidBuildActions(ctx android.ModuleContext) {
if ai.ForPrebuiltApex {
if deapexerModule == nil {
// This should never happen as a variant for a prebuilt_apex is only created if the
- // deapxer module has been configured to export the dex implementation jar for this module.
+ // deapexer module has been configured to export the dex implementation jar for this module.
ctx.ModuleErrorf("internal error: module %q does not depend on a `deapexer` module for prebuilt_apex %q",
j.Name(), ai.ApexVariationName)
+ return
}
// Get the path of the dex implementation jar from the `deapexer` module.