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

Split java device properties into separate struct

Browse Source 
Prevent host modules from having fields that only make sense for
device modules.

Test: builds
Change-Id: I20278e029a38fb9a6b75ef3c2cf3c1a97cef2b87
This commit is contained in:
Colin Cross
2017-06-22 17:01:52 -07:00
parent 46c9b8bfd5
commit 540eff8e5f
2 changed files with 43 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
java/app.go
View File

@@ -70,7 +70,7 @@ func (a *AndroidApp) DepsMutator(ctx android.BottomUpMutatorContext) {
var deps []string
if !a.properties.No_standard_libraries {
switch a.properties.Sdk_version { // TODO: Res_sdk_version?
switch a.deviceProperties.Sdk_version { // TODO: Res_sdk_version?
case "current", "system_current", "":
deps = append(deps, "framework-res")
default:
@@ -248,7 +248,7 @@ func (a *AndroidApp) aaptFlags(ctx android.ModuleContext) ([]string, android.Pat
}
})
sdkVersion := a.properties.Sdk_version
sdkVersion := a.deviceProperties.Sdk_version
if sdkVersion == "" {
sdkVersion = ctx.AConfig().PlatformSdkVersion()
}
@@ -277,8 +277,10 @@ func (a *AndroidApp) aaptFlags(ctx android.ModuleContext) ([]string, android.Pat
func AndroidAppFactory() (blueprint.Module, []interface{}) {
module := &AndroidApp{}
module.properties.Dex = true
module.deviceProperties.Dex = true
return android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibCommon,
&module.Module.properties, &module.appProperties)
&module.Module.properties,
&module.Module.deviceProperties,
&module.appProperties)
}