tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "CompilerDeviceProperties are added to the sdk impl library" am: b1a96e5ebf

Browse source 
am: 031973687f

Change-Id: I6e54c2f80c4cd3a2dffb6c87744e552e618a0393
This commit is contained in:
android-build-prod (mdb) 2018-05-01 19:35:06 -07:00 committed by android-build-merger
commit 927340ecd3
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
java/sdk_library.go
View file

@ -113,7 +113,8 @@ type sdkLibrary struct {
android.ModuleBase
android.DefaultableModuleBase
properties sdkLibraryProperties
properties sdkLibraryProperties
deviceProperties CompilerDeviceProperties
publicApiStubsPath android.Paths
systemApiStubsPath android.Paths
@ -405,7 +406,7 @@ func (module *sdkLibrary) createImplLibrary(mctx android.TopDownMutatorContext)
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
@ -523,6 +524,7 @@ func sdkLibraryMutator(mctx android.TopDownMutatorContext) {
func sdkLibraryFactory() android.Module {
module := &sdkLibrary{}
module.AddProperties(&module.properties)
module.AddProperties(&module.deviceProperties)
android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibCommon)
android.InitDefaultableModule(module)
return module