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

Merge "Change the partition of outputfile"

Browse source 
am: a3ab1a927e

Change-Id: I4ee6361ffc817ffb7aaae1f89bab9729f9d2a533
This commit is contained in:
Sundong Ahn 2019-11-17 19:03:36 -08:00 committed by android-build-merger
commit 1d4d5ea56b
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/module.go
View file

@ -1514,6 +1514,12 @@ func (m *ModuleBase) EnableNativeBridgeSupportByDefault() {
m.commonProperties.Native_bridge_supported = boolPtr(true)
}
func (m *ModuleBase) MakeAsSystemExt() {
if !Bool(m.commonProperties.Vendor) && !Bool(m.commonProperties.Product_specific) {
m.commonProperties.System_ext_specific = boolPtr(true)
}
}
// IsNativeBridgeSupported returns true if "native_bridge_supported" is explicitly set as "true"
func (m *ModuleBase) IsNativeBridgeSupported() bool {
return proptools.Bool(m.commonProperties.Native_bridge_supported)

5
apex/apex.go
View file

@ -345,7 +345,7 @@ func apexFlattenedMutator(mctx android.BottomUpMutatorContext) {
case "both":
variants = append(variants, imageApexType, zipApexType, flattenedApexType)
default:
mctx.PropertyErrorf("type", "%q is not one of \"image\" or \"zip\".", *ab.properties.Payload_type)
mctx.PropertyErrorf("type", "%q is not one of \"image\", \"zip\", or \"both\".", *ab.properties.Payload_type)
return
}
@ -359,6 +359,9 @@ func apexFlattenedMutator(mctx android.BottomUpMutatorContext) {
modules[i].(*apexBundle).properties.ApexType = zipApex
case flattenedApexType:
modules[i].(*apexBundle).properties.ApexType = flattenedApex
if !mctx.Config().FlattenApex() {
modules[i].(*apexBundle).MakeAsSystemExt()
}
}
}
}