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

Commit 4defbf4d authored by Paul Duffin's avatar Paul Duffin
Browse files

Switch platform_compat_config to use common arch 

Bug: 182816033
Test: m nothing
Change-Id: If8886edd9278d67fe2b6288a6bd8b152f2314401
parent 1bc21dc7

apex/apex.go

+1 −7
Original line number Diff line number Diff line
@@ -735,19 +735,13 @@ func (a *apexBundle) DepsMutator(ctx android.BottomUpMutatorContext) { 
		{Mutator: "arch", Variation: archForPrebuiltEtc.String()},

	}, prebuiltTag, a.properties.Prebuilts...)



	// Add dependency on platform_compat_configs.

	// TODO(b/182816033) - make this common-arch once all usages have been migrated.

	ctx.AddFarVariationDependencies([]blueprint.Variation{

		{Mutator: "os", Variation: ctx.Os().String()},

		{Mutator: "arch", Variation: archForPrebuiltEtc.String()},

	}, compatConfigsTag, a.properties.Compat_configs...)



	// Common-arch dependencies come next

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

	ctx.AddFarVariationDependencies(commonVariation, bootImageTag, a.properties.Boot_images...)

	ctx.AddFarVariationDependencies(commonVariation, javaLibTag, a.properties.Java_libs...)

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

	ctx.AddFarVariationDependencies(commonVariation, fsTag, a.properties.Filesystems...)

	ctx.AddFarVariationDependencies(commonVariation, compatConfigsTag, a.properties.Compat_configs...)



	if a.artApex {

		// With EMMA_INSTRUMENT_FRAMEWORK=true the ART boot image includes jacoco library.

java/platform_compat_config.go

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ func platformCompatConfigSingletonFactory() android.Singleton { 
func PlatformCompatConfigFactory() android.Module {

	module := &platformCompatConfig{}

	module.AddProperties(&module.properties)

	android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibFirst)

	android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibCommon)

	return module

}