Add java_system_modules to sdk/module_exports
Adds an SdkMemberType implementation for java_system_modules. It specifies that java_system_modules can be used with sdk as well as module_exports, and also that the libs property should be included as transitive members in the sdk. It also adds support for treating appropriate tagged properties in the snapshot prebuilts module as references to sdk members so that they are correctly transformed when creating the versioned modules. Bug: 142940300 Test: m nothing Change-Id: Ic10b5a6d5b92b6018334fe876f06feaf79cc55e9
This commit is contained in:
@@ -291,13 +291,17 @@ func (s *sdk) buildSnapshot(ctx android.ModuleContext) android.OutputPath {
|
||||
return outputZipFile
|
||||
}
|
||||
|
||||
type propertyTag struct {
|
||||
name string
|
||||
}
|
||||
|
||||
var sdkMemberReferencePropertyTag = propertyTag{"sdkMemberReferencePropertyTag"}
|
||||
|
||||
type unversionedToVersionedTransformation struct {
|
||||
identityTransformation
|
||||
builder *snapshotBuilder
|
||||
}
|
||||
|
||||
var _ bpTransformer = (*unversionedToVersionedTransformation)(nil)
|
||||
|
||||
func (t unversionedToVersionedTransformation) transformModule(module *bpModule) *bpModule {
|
||||
// Use a versioned name for the module but remember the original name for the
|
||||
// snapshot.
|
||||
@@ -307,6 +311,14 @@ func (t unversionedToVersionedTransformation) transformModule(module *bpModule)
|
||||
return module
|
||||
}
|
||||
|
||||
func (t unversionedToVersionedTransformation) transformProperty(name string, value interface{}, tag android.BpPropertyTag) (interface{}, android.BpPropertyTag) {
|
||||
if tag == sdkMemberReferencePropertyTag {
|
||||
return t.builder.versionedSdkMemberNames(value.([]string)), tag
|
||||
} else {
|
||||
return value, tag
|
||||
}
|
||||
}
|
||||
|
||||
func generateBpContents(contents *generatedContents, bpFile *bpFile) {
|
||||
contents.Printfln("// This is auto-generated. DO NOT EDIT.")
|
||||
for _, bpModule := range bpFile.order {
|
||||
@@ -453,6 +465,10 @@ func addHostDeviceSupportedProperties(module *android.ModuleBase, bpModule *bpMo
|
||||
}
|
||||
}
|
||||
|
||||
func (s *snapshotBuilder) SdkMemberReferencePropertyTag() android.BpPropertyTag {
|
||||
return sdkMemberReferencePropertyTag
|
||||
}
|
||||
|
||||
// Get a versioned name appropriate for the SDK snapshot version being taken.
|
||||
func (s *snapshotBuilder) versionedSdkMemberName(unversionedName string) string {
|
||||
return versionedSdkMemberName(s.ctx, unversionedName, s.version)
|
||||
|
Reference in New Issue
Block a user