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

Commit 72e7ffe6 authored by Anton Hansson's avatar Anton Hansson
Browse files

Make rros not overridable 

There are no current users of overriding rros, so it's dead code.
Additionally, there is some evidence of accidental misuse, so remove it
for now as we don't want arbitrary properties of AOSP modules to be
overridable in the general case.

Bug: 270542561
Bug: 269568074
Test: presubmit
Change-Id: I030abd644358baefc0d1543649c8a2a81a7491d0
parent e7545858

apex/apex.go

+4 −4
Original line number Diff line number Diff line
@@ -111,6 +111,9 @@ type apexBundleProperties struct { 


	Multilib apexMultilibProperties



	// List of runtime resource overlays (RROs) that are embedded inside this APEX.

	Rros []string



	// List of bootclasspath fragments that are embedded inside this APEX bundle.

	Bootclasspath_fragments []string
@@ -335,9 +338,6 @@ type overridableProperties struct { 
	// List of prebuilt files that are embedded inside this APEX bundle.

	Prebuilts []string



	// List of runtime resource overlays (RROs) that are embedded inside this APEX.

	Rros []string



	// List of BPF programs inside this APEX bundle.

	Bpfs []string
@@ -845,6 +845,7 @@ func (a *apexBundle) DepsMutator(ctx android.BottomUpMutatorContext) { 


	// Common-arch dependencies come next

	commonVariation := ctx.Config().AndroidCommonTarget.Variations()

	ctx.AddFarVariationDependencies(commonVariation, rroTag, a.properties.Rros...)

	ctx.AddFarVariationDependencies(commonVariation, bcpfTag, a.properties.Bootclasspath_fragments...)

	ctx.AddFarVariationDependencies(commonVariation, sscpfTag, a.properties.Systemserverclasspath_fragments...)

	ctx.AddFarVariationDependencies(commonVariation, javaLibTag, a.properties.Java_libs...)
@@ -861,7 +862,6 @@ func (a *apexBundle) OverridablePropertiesDepsMutator(ctx android.BottomUpMutato 
	commonVariation := ctx.Config().AndroidCommonTarget.Variations()

	ctx.AddFarVariationDependencies(commonVariation, androidAppTag, a.overridableProperties.Apps...)

	ctx.AddFarVariationDependencies(commonVariation, bpfTag, a.overridableProperties.Bpfs...)

	ctx.AddFarVariationDependencies(commonVariation, rroTag, a.overridableProperties.Rros...)

	if prebuilts := a.overridableProperties.Prebuilts; len(prebuilts) > 0 {

		// For prebuilt_etc, use the first variant (64 on 64/32bit device, 32 on 32bit device)

		// regardless of the TARGET_PREFER_* setting. See b/144532908