apex: Deprecate legacy_android10_support prop am: 5417f775e5 am: 14b360507a

Change-Id: I52872ae44fd2dfc9ef4a299aaf1412ec43e9fd8a
This commit is contained in:
Automerger Merge Worker
2020-03-16 05:06:18 +00:00
4 changed files with 16 additions and 21 deletions

View File

@@ -1064,11 +1064,9 @@ func apexDepsMutator(mctx android.TopDownMutatorContext) {
var apexBundles []android.ApexInfo
var directDep bool
if a, ok := mctx.Module().(*apexBundle); ok && !a.vndkApex {
minSdkVersion := a.minSdkVersion(mctx)
apexBundles = []android.ApexInfo{android.ApexInfo{
ApexName: mctx.ModuleName(),
LegacyAndroid10Support: proptools.Bool(a.properties.Legacy_android10_support),
MinSdkVersion: minSdkVersion,
ApexName: mctx.ModuleName(),
MinSdkVersion: a.minSdkVersion(mctx),
}}
directDep = true
} else if am, ok := mctx.Module().(android.ApexModule); ok {
@@ -1312,10 +1310,6 @@ type apexBundleProperties struct {
// Should be only used in tests#.
Test_only_no_hashtree *bool
// Whether this APEX should support Android10. Default is false. If this is set true, then apex_manifest.json is bundled as well
// because Android10 requires legacy apex_manifest.json instead of apex_manifest.pb
Legacy_android10_support *bool
IsCoverageVariant bool `blueprint:"mutated"`
// Whether this APEX is considered updatable or not. When set to true, this will enforce additional