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

Commit 53ce2488 authored by Paul Duffin's avatar Paul Duffin Committed by Automerger Merge Worker
Browse files

Merge "Remove artApex parameter from ApexBundleFactory" am: e760c3b7 am:... 

Merge "Remove artApex parameter from ApexBundleFactory" am: e760c3b7 am: fcba4216 am: 84e2edf8

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

Change-Id: Ife169b719a1effd6fcd2b561e4109b3d0ced7038
parents eeb575cf 84e2edf8

apex/apex.go

+1 −10
Original line number Diff line number Diff line
@@ -348,7 +348,6 @@ type apexBundle struct { 
	// Flags for special variants of APEX

	testApex bool

	vndkApex bool

	artApex  bool



	// Tells whether this variant of the APEX bundle is the primary one or not. Only the primary

	// one gets installed to the device.
@@ -754,13 +753,6 @@ func (a *apexBundle) DepsMutator(ctx android.BottomUpMutatorContext) { 
	ctx.AddFarVariationDependencies(commonVariation, fsTag, a.properties.Filesystems...)

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



	if a.artApex {

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

		if ctx.Config().IsEnvTrue("EMMA_INSTRUMENT_FRAMEWORK") {

			ctx.AddFarVariationDependencies(commonVariation, javaLibTag, "jacocoagent")

		}

	}



	// Marks that this APEX (in fact all the modules in it) has to be built with the given SDKs.

	// This field currently isn't used.

	// TODO(jiyong): consider dropping this feature
@@ -2203,10 +2195,9 @@ func newApexBundle() *apexBundle { 
	return module

}



func ApexBundleFactory(testApex bool, artApex bool) android.Module {

func ApexBundleFactory(testApex bool) android.Module {

	bundle := newApexBundle()

	bundle.testApex = testApex

	bundle.artApex = artApex

	return bundle

}