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

CompilerDeviceProperties are added to the sdk impl library

Browse Source 
java_sdk_library now accepts properties in CompilerDeviceProperties,
such as dex_preopt.profile. The properties are passed to the impl
library which is the device-specific sub-component of a
java_sdk_library.

Bug: 77575606
Test: m -j
Change-Id: I7303068bb62ca860352db306a5462fa4453ee80f
This commit is contained in:
Jiyong Park
2018-05-01 23:33:08 +09:00
parent 5a2c9d7a46
commit 441a47d1c9
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/sdk_library.go
View File

@@ -114,6 +114,7 @@ type sdkLibrary struct {
android.DefaultableModuleBase android.DefaultableModuleBase
properties sdkLibraryProperties properties sdkLibraryProperties
deviceProperties CompilerDeviceProperties
publicApiStubsPath android.Paths publicApiStubsPath android.Paths
systemApiStubsPath android.Paths systemApiStubsPath android.Paths
@@ -405,7 +406,7 @@ func (module *sdkLibrary) createImplLibrary(mctx android.TopDownMutatorContext)
props.Product_specific = proptools.BoolPtr(true) props.Product_specific = proptools.BoolPtr(true)
} }
mctx.CreateModule(android.ModuleFactoryAdaptor(LibraryFactory(true)), &props) mctx.CreateModule(android.ModuleFactoryAdaptor(LibraryFactory(true)), &props, &module.deviceProperties)
} }
// Creates the xml file that publicizes the runtime library // Creates the xml file that publicizes the runtime library
@@ -523,6 +524,7 @@ func sdkLibraryMutator(mctx android.TopDownMutatorContext) {
func sdkLibraryFactory() android.Module { func sdkLibraryFactory() android.Module {
module := &sdkLibrary{} module := &sdkLibrary{}
module.AddProperties(&module.properties) module.AddProperties(&module.properties)
module.AddProperties(&module.deviceProperties)
android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibCommon) android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibCommon)
android.InitDefaultableModule(module) android.InitDefaultableModule(module)
return module return module