StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove unnecessary copying of common properties"

Browse Source
This commit is contained in:
Treehugger Robot
2020-05-16 14:22:01 +00:00
committed by Gerrit Code Review
parent 805f2492e8 1dbe3ca254
commit 781baf01eb
1 changed files with 20 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
java/sdk_library.go
View File

@@ -747,21 +747,17 @@ func (module *SdkLibrary) latestRemovedApiFilegroupName(apiScope *apiScope) stri
// Creates a static java library that has API stubs // Creates a static java library that has API stubs
func (module *SdkLibrary) createStubsLibrary(mctx android.DefaultableHookContext, apiScope *apiScope) { func (module *SdkLibrary) createStubsLibrary(mctx android.DefaultableHookContext, apiScope *apiScope) {
props := struct { props := struct {
Name *string Name *string
Visibility []string Visibility []string
Srcs []string Srcs []string
Installable *bool Installable *bool
Sdk_version *string Sdk_version *string
System_modules *string System_modules *string
Patch_module *string Patch_module *string
Libs []string Libs []string
Soc_specific *bool Compile_dex *bool
Device_specific *bool Java_version *string
Product_specific *bool Product_variables struct {
System_ext_specific *bool
Compile_dex *bool
Java_version *string
Product_variables struct {
Pdk struct { Pdk struct {
Enabled *bool Enabled *bool
} }
@@ -801,15 +797,6 @@ func (module *SdkLibrary) createStubsLibrary(mctx android.DefaultableHookContext
props.Compile_dex = module.Library.Module.deviceProperties.Compile_dex props.Compile_dex = module.Library.Module.deviceProperties.Compile_dex
} }
if module.SocSpecific() {
props.Soc_specific = proptools.BoolPtr(true)
} else if module.DeviceSpecific() {
props.Device_specific = proptools.BoolPtr(true)
} else if module.ProductSpecific() {
props.Product_specific = proptools.BoolPtr(true)
} else if module.SystemExtSpecific() {
props.System_ext_specific = proptools.BoolPtr(true)
}
// Dist the class jar artifact for sdk builds. // Dist the class jar artifact for sdk builds.
if !Bool(module.sdkLibraryProperties.No_dist) { if !Bool(module.sdkLibraryProperties.No_dist) {
props.Dist.Targets = []string{"sdk", "win_sdk"} props.Dist.Targets = []string{"sdk", "win_sdk"}
@@ -984,29 +971,15 @@ func (module *SdkLibrary) DepIsInSameApex(mctx android.BaseModuleContext, dep an
// Creates the xml file that publicizes the runtime library // Creates the xml file that publicizes the runtime library
func (module *SdkLibrary) createXmlFile(mctx android.DefaultableHookContext) { func (module *SdkLibrary) createXmlFile(mctx android.DefaultableHookContext) {
props := struct { props := struct {
Name *string Name *string
Lib_name *string Lib_name *string
Soc_specific *bool Apex_available []string
Device_specific *bool
Product_specific *bool
System_ext_specific *bool
Apex_available []string
}{ }{
Name: proptools.StringPtr(module.xmlFileName()), Name: proptools.StringPtr(module.xmlFileName()),
Lib_name: proptools.StringPtr(module.BaseModuleName()), Lib_name: proptools.StringPtr(module.BaseModuleName()),
Apex_available: module.ApexProperties.Apex_available, Apex_available: module.ApexProperties.Apex_available,
} }
if module.SocSpecific() {
props.Soc_specific = proptools.BoolPtr(true)
} else if module.DeviceSpecific() {
props.Device_specific = proptools.BoolPtr(true)
} else if module.ProductSpecific() {
props.Product_specific = proptools.BoolPtr(true)
} else if module.SystemExtSpecific() {
props.System_ext_specific = proptools.BoolPtr(true)
}
mctx.CreateModule(sdkLibraryXmlFactory, &props) mctx.CreateModule(sdkLibraryXmlFactory, &props)
} }
@@ -1427,15 +1400,11 @@ func (module *sdkLibraryImport) createInternalModules(mctx android.DefaultableHo
func (module *sdkLibraryImport) createJavaImportForStubs(mctx android.DefaultableHookContext, apiScope *apiScope, scopeProperties *sdkLibraryScopeProperties) { func (module *sdkLibraryImport) createJavaImportForStubs(mctx android.DefaultableHookContext, apiScope *apiScope, scopeProperties *sdkLibraryScopeProperties) {
// Creates a java import for the jar with ".stubs" suffix // Creates a java import for the jar with ".stubs" suffix
props := struct { props := struct {
Name *string Name *string
Soc_specific *bool Sdk_version *string
Device_specific *bool Libs []string
Product_specific *bool Jars []string
System_ext_specific *bool Prefer *bool
Sdk_version *string
Libs []string
Jars []string
Prefer *bool
}{} }{}
props.Name = proptools.StringPtr(module.stubsLibraryModuleName(apiScope)) props.Name = proptools.StringPtr(module.stubsLibraryModuleName(apiScope))
props.Sdk_version = scopeProperties.Sdk_version props.Sdk_version = scopeProperties.Sdk_version
@@ -1443,15 +1412,7 @@ func (module *sdkLibraryImport) createJavaImportForStubs(mctx android.Defaultabl
// scopes to avoid having to duplicate them in each scope. // scopes to avoid having to duplicate them in each scope.
props.Libs = append(module.properties.Libs, scopeProperties.Libs...) props.Libs = append(module.properties.Libs, scopeProperties.Libs...)
props.Jars = scopeProperties.Jars props.Jars = scopeProperties.Jars
if module.SocSpecific() {
props.Soc_specific = proptools.BoolPtr(true)
} else if module.DeviceSpecific() {
props.Device_specific = proptools.BoolPtr(true)
} else if module.ProductSpecific() {
props.Product_specific = proptools.BoolPtr(true)
} else if module.SystemExtSpecific() {
props.System_ext_specific = proptools.BoolPtr(true)
}
// The imports are preferred if the java_sdk_library_import is preferred. // The imports are preferred if the java_sdk_library_import is preferred.
props.Prefer = proptools.BoolPtr(module.prebuilt.Prefer()) props.Prefer = proptools.BoolPtr(module.prebuilt.Prefer())
mctx.CreateModule(ImportFactory, &props) mctx.CreateModule(ImportFactory, &props)