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

Revert "Add an Override_apex_available property for APEX"

Browse Source 
This reverts commit dd2c76e772.

Reason for revert: This was submitted without build system team +2 with no rationale for why it's needed.

Change-Id: I86b9849122ec2b7a382d4f39bbbc0ea1ff70c4bc
This commit is contained in:
Joe Onorato
2023-02-22 17:17:31 +00:00
committed by Gerrit Code Review
parent dd2c76e772
commit 8bb9a4a194
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apex/apex.go
View File

@@ -141,9 +141,6 @@ type apexBundleProperties struct {
// Default: true. // Default: true.
Installable *bool Installable *bool
// Whether this APEX ignores the apex_available list defined in its dependencies.
Override_apex_available *bool
// If set true, VNDK libs are considered as stable libs and are not included in this APEX. // If set true, VNDK libs are considered as stable libs and are not included in this APEX.
// Should be only used in non-system apexes (e.g. vendor: true). Default is false. // Should be only used in non-system apexes (e.g. vendor: true). Default is false.
Use_vndk_as_stable *bool Use_vndk_as_stable *bool
@@ -1516,10 +1513,6 @@ func (a *apexBundle) UsePlatformApis() bool {
return proptools.BoolDefault(a.properties.Platform_apis, false) return proptools.BoolDefault(a.properties.Platform_apis, false)
} }
func (a *apexBundle) OverrideApexAvailable() bool {
return proptools.BoolDefault(a.properties.Override_apex_available, false)
}
// getCertString returns the name of the cert that should be used to sign this APEX. This is // getCertString returns the name of the cert that should be used to sign this APEX. This is
// basically from the "certificate" property, but could be overridden by the device config. // basically from the "certificate" property, but could be overridden by the device config.
func (a *apexBundle) getCertString(ctx android.BaseModuleContext) string { func (a *apexBundle) getCertString(ctx android.BaseModuleContext) string {
@@ -3047,11 +3040,6 @@ func (a *apexBundle) checkApexAvailability(ctx android.ModuleContext) {
return return
} }
// Ignore availability when `override_apex_available` is true.
if a.OverrideApexAvailable() {
return
}
a.WalkPayloadDeps(ctx, func(ctx android.ModuleContext, from blueprint.Module, to android.ApexModule, externalDep bool) bool { a.WalkPayloadDeps(ctx, func(ctx android.ModuleContext, from blueprint.Module, to android.ApexModule, externalDep bool) bool {
// As soon as the dependency graph crosses the APEX boundary, don't go further. // As soon as the dependency graph crosses the APEX boundary, don't go further.
if externalDep { if externalDep {