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

Commit eb8051d8 authored by Paul Duffin's avatar Paul Duffin
Browse files

Remove artApex parameter from ApexBundleFactory 

Since coverage support was added to bootclasspath_fragment in
https://r.android.com/1684807 and bootclasspath_fragments were
integrated into the ART APEX it is no longer necessary to treat ART
APEXes differently to other APEXes.

Change https://r.android.com/1684807 added coverage support, follow
up changes integrated

Bug: 177892522
Test: m droid
      m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true
Change-Id: I4800a003c7459c4686607e16f4c5bde0be105f16
parent 2a109db1

apex/apex.go

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

	// Flags for special variants of APEX

	testApex bool

	testApex bool

	vndkApex bool

	vndkApex bool

	artApex  bool





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

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

	// one gets installed to the device.

	// 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, fsTag, a.properties.Filesystems...)

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

	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.

	// 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.

	// This field currently isn't used.

	// TODO(jiyong): consider dropping this feature

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

	return module

}

}





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

func ApexBundleFactory(testApex bool) android.Module {

	bundle := newApexBundle()

	bundle := newApexBundle()

	bundle.testApex = testApex

	bundle.testApex = testApex

	bundle.artApex = artApex

	return bundle

	return bundle

}

}