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

Commit c4f4cedc authored by Martin Stjernholm's avatar Martin Stjernholm
Browse files

Merge "Drop "prebuilt_" prefixes from names registered in ApexInfo.InApexXxx." 

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

Bug: 180325915
Change-Id: I1fd96bad2326612d153fed31308914902f58d3ec
Merged-In: Icbe4e025ce1a4c8dd258ff95d326ca2f27905188
(cherry picked from commit f4c44417)
parent ae5072fa

android/apex.go

+0 −13
Original line number Diff line number Diff line
@@ -117,19 +117,6 @@ func (i ApexInfo) InApexVariant(apexVariant string) bool { 
	return false

}



// InApexByBaseName tells whether this apex variant of the module is part of the given apexVariant

// or not, where the APEX is specified by its canonical base name, i.e. typically beginning with

// "com.android.". In particular this function doesn't differentiate between source and prebuilt

// APEXes, where the latter may have "prebuilt_" prefixes.

func (i ApexInfo) InApexVariantByBaseName(apexVariant string) bool {

	for _, a := range i.InApexVariants {

		if RemoveOptionalPrebuiltPrefix(a) == apexVariant {

			return true

		}

	}

	return false

}



func (i ApexInfo) InApexModule(apexModuleName string) bool {

	for _, a := range i.InApexModules {

		if a == apexModuleName {

apex/prebuilt.go

+4 −3
Original line number Diff line number Diff line
@@ -227,10 +227,11 @@ func (p *prebuiltCommon) apexInfoMutator(mctx android.TopDownMutatorContext) { 
	})



	// Create an ApexInfo for the prebuilt_apex.

	apexVariationName := android.RemoveOptionalPrebuiltPrefix(mctx.ModuleName())

	apexInfo := android.ApexInfo{

		ApexVariationName: android.RemoveOptionalPrebuiltPrefix(mctx.ModuleName()),

		InApexVariants:    []string{mctx.ModuleName()},

		InApexModules:     []string{mctx.ModuleName()},

		ApexVariationName: apexVariationName,

		InApexVariants:    []string{apexVariationName},

		InApexModules:     []string{apexVariationName},

		ApexContents:      []*android.ApexContents{apexContents},

		ForPrebuiltApex:   true,

	}

java/hiddenapi_singleton.go

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ func isModuleInConfiguredList(ctx android.BaseModuleContext, module android.Modu 
			// A platform variant is required but this is for an apex so ignore it.

			return false

		}

	} else if !apexInfo.InApexVariantByBaseName(requiredApex) {

	} else if !apexInfo.InApexVariant(requiredApex) {

		// An apex variant for a specific apex is required but this is the wrong apex.

		return false

	}