From b17d04462867ac735a4c1b86e81115e1179c90ef Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Wed, 5 May 2021 12:07:00 +0100 Subject: 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 --- java/java.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'java/java.go') 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. -- cgit v1.2.3-59-g8ed1b