Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d96ed8d authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Add TARGET_FORCE_APEX_SYMLINK_OPTIMIZATION"

parents f33786d3 4da07973

android/config.go

+4 −0
Original line number Diff line number Diff line
@@ -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)

}

android/variable.go

+4 −3
Original line number Diff line number Diff line
@@ -321,6 +321,7 @@ type productVariables struct { 
	Exclude_draft_ndk_apis *bool `json:",omitempty"`



	Flatten_apex                 *bool `json:",omitempty"`

	ForceApexSymlinkOptimization *bool `json:",omitempty"`

	CompressedApex               *bool `json:",omitempty"`

	Aml_abis                     *bool `json:",omitempty"`

apex/apex.go

+4 −2
Original line number Diff line number Diff line
@@ -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

	}