summaryrefslogtreecommitdiff
path: root/java/java.go
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2021-05-05 12:07:00 +0100
committerPaul Duffin <paulduffin@google.com>2021-05-06 23:43:43 +0100
commitb17d04462867ac735a4c1b86e81115e1179c90ef (patch)
tree39b5bc71573c1868cf84c6554249afad18023d03 /java/java.go
parent7c8769231b39e6682a9571342efcf20298734ff9 (diff)
Transitively add APEX variants for contents of prebuilt_apex/apex_set
This is part of the work needed to allow the exported_java_libs property to be replaced by exported_bootclasspath_fragments. Bug: 187266082 Test: m nothing m SOONG_CONFIG_art_module_source_build=false nothing Change-Id: I2c1d70a390200b93163f9799719290c9d55a041c
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.