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

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

Merge changes I505a7ad8,I92d88199 into main 

* changes:
  Disable source apex variant using apex_available_name
  Skip `contents` validation of source bootclasspath fragments
parents 4301e29a 003452ff

android/apex.go

+3 −0
Original line number Diff line number Diff line
@@ -88,6 +88,9 @@ type ApexInfo struct { 


	// Returns the name of the overridden apex (com.android.foo)

	BaseApexName string



	// Returns the value of `apex_available_name`

	ApexAvailableName string

}



// AllApexInfo holds the ApexInfo of all apexes that include this module.

apex/apex.go

+1 −0
Original line number Diff line number Diff line
@@ -1078,6 +1078,7 @@ func (a *apexBundle) ApexInfoMutator(mctx android.TopDownMutatorContext) { 
		ApexContents:      []*android.ApexContents{apexContents},

		TestApexes:        testApexes,

		BaseApexName:      mctx.ModuleName(),

		ApexAvailableName: proptools.String(a.properties.Apex_available_name),

	}

	mctx.WalkDeps(func(child, parent android.Module) bool {

		if !continueApexDepsWalk(child, parent) {

apex/bootclasspath_fragment_test.go

+4 −0
Original line number Diff line number Diff line
@@ -835,6 +835,7 @@ func TestBootclasspathFragment_HiddenAPIList(t *testing.T) { 
	`)



	java.CheckModuleDependencies(t, result.TestContext, "mybootclasspathfragment", "android_common_apex10000", []string{

		"all_apex_contributions",

		"art-bootclasspath-fragment",

		"bar",

		"dex2oatd",
@@ -1006,6 +1007,7 @@ func TestBootclasspathFragment_AndroidNonUpdatable_FromSource(t *testing.T) { 
	`)



	java.CheckModuleDependencies(t, result.TestContext, "mybootclasspathfragment", "android_common_apex10000", []string{

		"all_apex_contributions",

		"android-non-updatable.stubs",

		"android-non-updatable.stubs.module_lib",

		"android-non-updatable.stubs.system",
@@ -1178,6 +1180,7 @@ func TestBootclasspathFragment_AndroidNonUpdatable_FromText(t *testing.T) { 
	`)



	java.CheckModuleDependencies(t, result.TestContext, "mybootclasspathfragment", "android_common_apex10000", []string{

		"all_apex_contributions",

		"android-non-updatable.stubs",

		"android-non-updatable.stubs.system",

		"android-non-updatable.stubs.test",
@@ -1331,6 +1334,7 @@ func TestBootclasspathFragment_AndroidNonUpdatable_AlwaysUsePrebuiltSdks(t *test 
	`)



	java.CheckModuleDependencies(t, result.TestContext, "mybootclasspathfragment", "android_common_apex10000", []string{

		"all_apex_contributions",

		"art-bootclasspath-fragment",

		"bar",

		"dex2oatd",

java/bootclasspath_fragment.go

+6 −0
Original line number Diff line number Diff line
@@ -463,6 +463,12 @@ func (b *BootclasspathFragmentModule) DepsMutator(ctx android.BottomUpMutatorCon 
	// Add a dependency onto the dex2oat tool which is needed for creating the boot image. The

	// path is retrieved from the dependency by GetGlobalSoongConfig(ctx).

	dexpreopt.RegisterToolDeps(ctx)



	// Add a dependency to `all_apex_contributions` to determine if prebuilts are active.

	// If prebuilts are active, `contents` validation on the source bootclasspath fragment should be disabled.

	if _, isPrebuiltModule := ctx.Module().(*PrebuiltBootclasspathFragmentModule); !isPrebuiltModule {

		ctx.AddDependency(b, android.AcDepTag, "all_apex_contributions")

	}

}



func (b *BootclasspathFragmentModule) BootclasspathDepsMutator(ctx android.BottomUpMutatorContext) {

java/dexpreopt.go

+8 −3
Original line number Diff line number Diff line
@@ -209,13 +209,18 @@ func disableSourceApexVariant(ctx android.BaseModuleContext) bool { 
			psi = prebuiltSelectionInfo

		}

	})



	// Find the apex variant for this module

	var apexVariantsWithoutTestApexes []string

	apexVariantsWithoutTestApexes := []string{}

	if apexInfo.BaseApexName != "" {

		// This is a transitive dependency of an override_apex

		apexVariantsWithoutTestApexes = []string{apexInfo.BaseApexName}

		apexVariantsWithoutTestApexes = append(apexVariantsWithoutTestApexes, apexInfo.BaseApexName)

	} else {

		_, apexVariantsWithoutTestApexes, _ = android.ListSetDifference(apexInfo.InApexVariants, apexInfo.TestApexes)

		_, variants, _ := android.ListSetDifference(apexInfo.InApexVariants, apexInfo.TestApexes)

		apexVariantsWithoutTestApexes = append(apexVariantsWithoutTestApexes, variants...)

	}

	if apexInfo.ApexAvailableName != "" {

		apexVariantsWithoutTestApexes = append(apexVariantsWithoutTestApexes, apexInfo.ApexAvailableName)

	}

	disableSource := false

	// find the selected apexes