diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/bootclasspath_fragment.go | 5 | ||||
| -rw-r--r-- | java/dexpreopt_bootjars.go | 2 | ||||
| -rw-r--r-- | java/java.go | 5 | ||||
| -rw-r--r-- | java/sdk_library.go | 9 | ||||
| -rw-r--r-- | java/system_modules.go | 6 |
5 files changed, 11 insertions, 16 deletions
diff --git a/java/bootclasspath_fragment.go b/java/bootclasspath_fragment.go index 8fe362a56..6270b5b35 100644 --- a/java/bootclasspath_fragment.go +++ b/java/bootclasspath_fragment.go @@ -32,9 +32,8 @@ func init() { android.RegisterSdkMemberType(&bootclasspathFragmentMemberType{ SdkMemberTypeBase: android.SdkMemberTypeBase{ - PropertyName: "bootclasspath_fragments", - SupportsSdk: true, - TransitiveSdkMembers: true, + PropertyName: "bootclasspath_fragments", + SupportsSdk: true, }, }) } diff --git a/java/dexpreopt_bootjars.go b/java/dexpreopt_bootjars.go index ce5155f7d..06326ac53 100644 --- a/java/dexpreopt_bootjars.go +++ b/java/dexpreopt_bootjars.go @@ -790,7 +790,7 @@ func bootImageProfileRule(ctx android.SingletonContext, image *bootImageConfig) rule.Build("bootJarsProfile", "profile boot jars") - image.profileInstalls = rule.Installs() + image.profileInstalls = append(image.profileInstalls, rule.Installs()...) return profile } 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. diff --git a/java/sdk_library.go b/java/sdk_library.go index fcc105d56..aff453973 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -1756,6 +1756,7 @@ func SdkLibraryFactory() android.Module { module.InitSdkLibraryProperties() android.InitApexModule(module) + android.InitSdkAwareModule(module) InitJavaModule(module, android.HostAndDeviceSupported) // Initialize the map from scope to scope specific properties. @@ -2385,9 +2386,6 @@ type sdkLibrarySdkMemberProperties struct { // Scope to per scope properties. Scopes map[*apiScope]scopeProperties - // Additional libraries that the exported stubs libraries depend upon. - Libs []string - // The Java stubs source files. Stub_srcs []string @@ -2439,7 +2437,6 @@ func (s *sdkLibrarySdkMemberProperties) PopulateFromVariant(ctx android.SdkMembe } } - s.Libs = sdk.properties.Libs s.Naming_scheme = sdk.commonSdkLibraryProperties.Naming_scheme s.Shared_library = proptools.BoolPtr(sdk.sharedLibrary()) s.Compile_dex = sdk.dexProperties.Compile_dex @@ -2504,8 +2501,4 @@ func (s *sdkLibrarySdkMemberProperties) AddToPropertySet(ctx android.SdkMemberCo } propertySet.AddProperty("doctag_files", dests) } - - if len(s.Libs) > 0 { - propertySet.AddPropertyWithTag("libs", s.Libs, ctx.SnapshotBuilder().SdkMemberReferencePropertyTag(false)) - } } diff --git a/java/system_modules.go b/java/system_modules.go index a09778cd0..d0dc74adc 100644 --- a/java/system_modules.go +++ b/java/system_modules.go @@ -35,9 +35,8 @@ func init() { // Register sdk member types. android.RegisterSdkMemberType(&systemModulesSdkMemberType{ android.SdkMemberTypeBase{ - PropertyName: "java_system_modules", - SupportsSdk: true, - TransitiveSdkMembers: true, + PropertyName: "java_system_modules", + SupportsSdk: true, }, }) } @@ -115,6 +114,7 @@ func SystemModulesFactory() android.Module { module.AddProperties(&module.properties) android.InitAndroidArchModule(module, android.HostAndDeviceSupported, android.MultilibCommon) android.InitDefaultableModule(module) + android.InitSdkAwareModule(module) return module } |