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

Merge "Add TARGET_FORCE_APEX_SYMLINK_OPTIMIZATION" am: 0d96ed8d5b am: 0ff3ac38cb

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1540045

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3b21f04591e8babc9f79f88fad159304630900db
This commit is contained in:
Treehugger Robot
2021-01-06 04:51:13 +00:00
committed by Automerger Merge Worker
parent 09aaf61f10 0ff3ac38cb
commit ee12c19685
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/config.go
View File

@@ -1272,6 +1272,10 @@ func (c *config) FlattenApex() bool {
return Bool(c.productVariables.Flatten_apex)
}
func (c *config) ForceApexSymlinkOptimization() bool {
return Bool(c.productVariables.ForceApexSymlinkOptimization)
}
func (c *config) CompressedApex() bool {
return Bool(c.productVariables.CompressedApex)
}

7
android/variable.go
View File

@@ -320,9 +320,10 @@ type productVariables struct {
Ndk_abis *bool `json:",omitempty"`
Exclude_draft_ndk_apis *bool `json:",omitempty"`
Flatten_apex *bool `json:",omitempty"`
CompressedApex *bool `json:",omitempty"`
Aml_abis *bool `json:",omitempty"`
Flatten_apex *bool `json:",omitempty"`
ForceApexSymlinkOptimization *bool `json:",omitempty"`
CompressedApex *bool `json:",omitempty"`
Aml_abis *bool `json:",omitempty"`
DexpreoptGlobalConfig *string `json:",omitempty"`

6
apex/apex.go
View File

@@ -1913,9 +1913,11 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) {
a.linkToSystemLib = false
}
forced := ctx.Config().ForceApexSymlinkOptimization()
// We don't need the optimization for updatable APEXes, as it might give false signal
// to the system health when the APEXes are still bundled (b/149805758)
if a.Updatable() && a.properties.ApexType == imageApex {
// to the system health when the APEXes are still bundled (b/149805758).
if !forced && a.Updatable() && a.properties.ApexType == imageApex {
a.linkToSystemLib = false
}