diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2021-05-08 03:01:25 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-05-08 03:01:25 +0000 |
| commit | b3242043c3dff703dcf87a7b98d735ebf51a3b7c (patch) | |
| tree | f81de8c0e8884f94d0e0c8eeaa8ee2f0588ea858 /java/java.go | |
| parent | 40436935d127ccade87ac834f54019f6c414b4cc (diff) | |
| parent | 4cb335b3e53291c0e38bdd6e0708169d70e960bc (diff) | |
Snap for 7347062 from 4cb335b3e53291c0e38bdd6e0708169d70e960bc to sc-release
Change-Id: I801c1871a37460c5bda67e4fd5811cb82b08da07
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/java/java.go b/java/java.go index 7258dcefd..d74bf6825 100644 --- a/java/java.go +++ b/java/java.go @@ -669,6 +669,7 @@ func LibraryHostFactory() android.Module { module.Module.properties.Installable = proptools.BoolPtr(true) android.InitApexModule(module) + android.InitSdkAwareModule(module) InitJavaModule(module, android.HostSupported) return module } @@ -923,6 +924,7 @@ func TestFactory() android.Module { module.Module.dexpreopter.isTest = true module.Module.linter.test = true + android.InitSdkAwareModule(module) InitJavaModule(module, android.HostAndDeviceSupported) return module } @@ -1296,9 +1298,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. |