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

Commit 160657a7 authored by Martin Stjernholm's avatar Martin Stjernholm Committed by Automerger Merge Worker
Browse files

Merge changes I4e7a7ac5,I0c73361b into sc-dev am: f7a62e6c 

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

Change-Id: I02c13e1bd14ce6f0a8563180c3efe85d3cdde572
parents c2671f48 f7a62e6c

android/apex.go

+33 −1
Original line number Diff line number Diff line
@@ -63,6 +63,14 @@ type ApexInfo struct { 
	// that are merged together.

	InApexVariants []string



	// List of APEX Soong module names that this module is part of. Note that the list includes

	// different variations of the same APEX. For example, if module `foo` is included in the

	// apex `com.android.foo`, and also if there is an override_apex module

	// `com.mycompany.android.foo` overriding `com.android.foo`, then this list contains both

	// `com.android.foo` and `com.mycompany.android.foo`.  If the APEX Soong module is a

	// prebuilt, the name here doesn't have the `prebuilt_` prefix.

	InApexModules []string



	// Pointers to the ApexContents struct each of which is for apexBundle modules that this

	// module is part of. The ApexContents gives information about which modules the apexBundle

	// has and whether a module became part of the apexBundle via a direct dependency or not.
@@ -122,6 +130,15 @@ func (i ApexInfo) InApexVariantByBaseName(apexVariant string) bool { 
	return false

}



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

	for _, a := range i.InApexModules {

		if a == apexModuleName {

			return true

		}

	}

	return false

}



// ApexTestForInfo stores the contents of APEXes for which this module is a test - although this

// module is not part of the APEX - and thus has access to APEX internals.

type ApexTestForInfo struct {
@@ -351,8 +368,21 @@ func (m *ApexModuleBase) ApexAvailable() []string { 
func (m *ApexModuleBase) BuildForApex(apex ApexInfo) {

	m.apexInfosLock.Lock()

	defer m.apexInfosLock.Unlock()

	for _, v := range m.apexInfos {

	for i, v := range m.apexInfos {

		if v.ApexVariationName == apex.ApexVariationName {

			if len(apex.InApexModules) != 1 {

				panic(fmt.Errorf("Newly created apexInfo must be for a single APEX"))

			}

			// Even when the ApexVariantNames are the same, the given ApexInfo might

			// actually be for different APEX. This can happen when an APEX is

			// overridden via override_apex. For example, there can be two apexes

			// `com.android.foo` (from the `apex` module type) and

			// `com.mycompany.android.foo` (from the `override_apex` module type), both

			// of which has the same ApexVariantName `com.android.foo`. Add the apex

			// name to the list so that it's not lost.

			if !InList(apex.InApexModules[0], v.InApexModules) {

				m.apexInfos[i].InApexModules = append(m.apexInfos[i].InApexModules, apex.InApexModules[0])

			}

			return

		}

	}
@@ -507,12 +537,14 @@ func mergeApexVariations(ctx PathContext, apexInfos []ApexInfo) (merged []ApexIn 
		if index, exists := seen[mergedName]; exists {

			// Variants having the same mergedName are deduped

			merged[index].InApexVariants = append(merged[index].InApexVariants, variantName)

			merged[index].InApexModules = append(merged[index].InApexModules, apexInfo.InApexModules...)

			merged[index].ApexContents = append(merged[index].ApexContents, apexInfo.ApexContents...)

			merged[index].Updatable = merged[index].Updatable || apexInfo.Updatable

		} else {

			seen[mergedName] = len(merged)

			apexInfo.ApexVariationName = mergedName

			apexInfo.InApexVariants = CopyOf(apexInfo.InApexVariants)

			apexInfo.InApexModules = CopyOf(apexInfo.InApexModules)

			apexInfo.ApexContents = append([]*ApexContents(nil), apexInfo.ApexContents...)

			merged = append(merged, apexInfo)

		}

android/apex_test.go

+21 −21
Original line number Diff line number Diff line
@@ -33,10 +33,10 @@ func Test_mergeApexVariations(t *testing.T) { 
		{

			name: "single",

			in: []ApexInfo{

				{"foo", FutureApiLevel, false, nil, []string{"foo"}, nil, NotForPrebuiltApex},

				{"foo", FutureApiLevel, false, nil, []string{"foo"}, []string{"foo"}, nil, NotForPrebuiltApex},

			},

			wantMerged: []ApexInfo{

				{"apex10000", FutureApiLevel, false, nil, []string{"foo"}, nil, NotForPrebuiltApex},

				{"apex10000", FutureApiLevel, false, nil, []string{"foo"}, []string{"foo"}, nil, NotForPrebuiltApex},

			},

			wantAliases: [][2]string{

				{"foo", "apex10000"},
@@ -45,11 +45,11 @@ func Test_mergeApexVariations(t *testing.T) { 
		{

			name: "merge",

			in: []ApexInfo{

				{"foo", FutureApiLevel, false, SdkRefs{{"baz", "1"}}, []string{"foo"}, nil, NotForPrebuiltApex},

				{"bar", FutureApiLevel, false, SdkRefs{{"baz", "1"}}, []string{"bar"}, nil, NotForPrebuiltApex},

				{"foo", FutureApiLevel, false, SdkRefs{{"baz", "1"}}, []string{"foo"}, []string{"foo"}, nil, NotForPrebuiltApex},

				{"bar", FutureApiLevel, false, SdkRefs{{"baz", "1"}}, []string{"bar"}, []string{"bar"}, nil, NotForPrebuiltApex},

			},

			wantMerged: []ApexInfo{

				{"apex10000_baz_1", FutureApiLevel, false, SdkRefs{{"baz", "1"}}, []string{"bar", "foo"}, nil, false}},

				{"apex10000_baz_1", FutureApiLevel, false, SdkRefs{{"baz", "1"}}, []string{"bar", "foo"}, []string{"bar", "foo"}, nil, false}},

			wantAliases: [][2]string{

				{"bar", "apex10000_baz_1"},

				{"foo", "apex10000_baz_1"},
@@ -58,12 +58,12 @@ func Test_mergeApexVariations(t *testing.T) { 
		{

			name: "don't merge version",

			in: []ApexInfo{

				{"foo", FutureApiLevel, false, nil, []string{"foo"}, nil, NotForPrebuiltApex},

				{"bar", uncheckedFinalApiLevel(30), false, nil, []string{"bar"}, nil, NotForPrebuiltApex},

				{"foo", FutureApiLevel, false, nil, []string{"foo"}, []string{"foo"}, nil, NotForPrebuiltApex},

				{"bar", uncheckedFinalApiLevel(30), false, nil, []string{"bar"}, []string{"bar"}, nil, NotForPrebuiltApex},

			},

			wantMerged: []ApexInfo{

				{"apex30", uncheckedFinalApiLevel(30), false, nil, []string{"bar"}, nil, NotForPrebuiltApex},

				{"apex10000", FutureApiLevel, false, nil, []string{"foo"}, nil, NotForPrebuiltApex},

				{"apex30", uncheckedFinalApiLevel(30), false, nil, []string{"bar"}, []string{"bar"}, nil, NotForPrebuiltApex},

				{"apex10000", FutureApiLevel, false, nil, []string{"foo"}, []string{"foo"}, nil, NotForPrebuiltApex},

			},

			wantAliases: [][2]string{

				{"bar", "apex30"},
@@ -73,11 +73,11 @@ func Test_mergeApexVariations(t *testing.T) { 
		{

			name: "merge updatable",

			in: []ApexInfo{

				{"foo", FutureApiLevel, false, nil, []string{"foo"}, nil, NotForPrebuiltApex},

				{"bar", FutureApiLevel, true, nil, []string{"bar"}, nil, NotForPrebuiltApex},

				{"foo", FutureApiLevel, false, nil, []string{"foo"}, []string{"foo"}, nil, NotForPrebuiltApex},

				{"bar", FutureApiLevel, true, nil, []string{"bar"}, []string{"bar"}, nil, NotForPrebuiltApex},

			},

			wantMerged: []ApexInfo{

				{"apex10000", FutureApiLevel, true, nil, []string{"bar", "foo"}, nil, NotForPrebuiltApex},

				{"apex10000", FutureApiLevel, true, nil, []string{"bar", "foo"}, []string{"bar", "foo"}, nil, NotForPrebuiltApex},

			},

			wantAliases: [][2]string{

				{"bar", "apex10000"},
@@ -87,12 +87,12 @@ func Test_mergeApexVariations(t *testing.T) { 
		{

			name: "don't merge sdks",

			in: []ApexInfo{

				{"foo", FutureApiLevel, false, SdkRefs{{"baz", "1"}}, []string{"foo"}, nil, NotForPrebuiltApex},

				{"bar", FutureApiLevel, false, SdkRefs{{"baz", "2"}}, []string{"bar"}, nil, NotForPrebuiltApex},

				{"foo", FutureApiLevel, false, SdkRefs{{"baz", "1"}}, []string{"foo"}, []string{"foo"}, nil, NotForPrebuiltApex},

				{"bar", FutureApiLevel, false, SdkRefs{{"baz", "2"}}, []string{"bar"}, []string{"bar"}, nil, NotForPrebuiltApex},

			},

			wantMerged: []ApexInfo{

				{"apex10000_baz_2", FutureApiLevel, false, SdkRefs{{"baz", "2"}}, []string{"bar"}, nil, NotForPrebuiltApex},

				{"apex10000_baz_1", FutureApiLevel, false, SdkRefs{{"baz", "1"}}, []string{"foo"}, nil, NotForPrebuiltApex},

				{"apex10000_baz_2", FutureApiLevel, false, SdkRefs{{"baz", "2"}}, []string{"bar"}, []string{"bar"}, nil, NotForPrebuiltApex},

				{"apex10000_baz_1", FutureApiLevel, false, SdkRefs{{"baz", "1"}}, []string{"foo"}, []string{"foo"}, nil, NotForPrebuiltApex},

			},

			wantAliases: [][2]string{

				{"bar", "apex10000_baz_2"},
@@ -102,15 +102,15 @@ func Test_mergeApexVariations(t *testing.T) { 
		{

			name: "don't merge when for prebuilt_apex",

			in: []ApexInfo{

				{"foo", FutureApiLevel, false, nil, []string{"foo"}, nil, NotForPrebuiltApex},

				{"bar", FutureApiLevel, true, nil, []string{"bar"}, nil, NotForPrebuiltApex},

				{"foo", FutureApiLevel, false, nil, []string{"foo"}, []string{"foo"}, nil, NotForPrebuiltApex},

				{"bar", FutureApiLevel, true, nil, []string{"bar"}, []string{"bar"}, nil, NotForPrebuiltApex},

				// This one should not be merged in with the others because it is for

				// a prebuilt_apex.

				{"baz", FutureApiLevel, true, nil, []string{"baz"}, nil, ForPrebuiltApex},

				{"baz", FutureApiLevel, true, nil, []string{"baz"}, []string{"baz"}, nil, ForPrebuiltApex},

			},

			wantMerged: []ApexInfo{

				{"apex10000", FutureApiLevel, true, nil, []string{"bar", "foo"}, nil, NotForPrebuiltApex},

				{"baz", FutureApiLevel, true, nil, []string{"baz"}, nil, ForPrebuiltApex},

				{"apex10000", FutureApiLevel, true, nil, []string{"bar", "foo"}, []string{"bar", "foo"}, nil, NotForPrebuiltApex},

				{"baz", FutureApiLevel, true, nil, []string{"baz"}, []string{"baz"}, nil, ForPrebuiltApex},

			},

			wantAliases: [][2]string{

				{"bar", "apex10000"},

apex/apex.go

+6 −2
Original line number Diff line number Diff line
@@ -895,12 +895,16 @@ func (a *apexBundle) ApexInfoMutator(mctx android.TopDownMutatorContext) { 


	// This is the main part of this mutator. Mark the collected dependencies that they need to

	// be built for this apexBundle.



	// Note that there are many different names.

	// ApexVariationName: this is the name of the apex variation

	apexInfo := android.ApexInfo{

		ApexVariationName: mctx.ModuleName(),

		ApexVariationName: mctx.ModuleName(), // could be com.android.foo

		MinSdkVersion:     minSdkVersion,

		RequiredSdks:      a.RequiredSdks(),

		Updatable:         a.Updatable(),

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

		InApexVariants:    []string{mctx.ModuleName()}, // could be com.android.foo

		InApexModules:     []string{a.Name()},          // could be com.mycompany.android.foo

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

	}

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

apex/prebuilt.go

+1 −0
Original line number Diff line number Diff line
@@ -230,6 +230,7 @@ func (p *prebuiltCommon) apexInfoMutator(mctx android.TopDownMutatorContext) { 
	apexInfo := android.ApexInfo{

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

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

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

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

		ForPrebuiltApex:   true,

	}

java/boot_jars.go

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ func (b *bootJarsSingleton) GenerateBuildActions(ctx android.SingletonContext) { 
		name := android.RemoveOptionalPrebuiltPrefix(ctx.ModuleName(module))

		if apex, ok := moduleToApex[name]; ok {

			apexInfo := ctx.ModuleProvider(module, android.ApexInfoProvider).(android.ApexInfo)

			if (apex == "platform" && apexInfo.IsForPlatform()) || apexInfo.InApexVariantByBaseName(apex) {

			if (apex == "platform" && apexInfo.IsForPlatform()) || apexInfo.InApexModule(apex) {

				// The module name/apex variant should be unique in the system but double check

				// just in case something has gone wrong.

				if existing, ok := nameToApexVariant[name]; ok {