From eb8051d80d6a882b8f5f93101e7b197118cb4484 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Mon, 18 Oct 2021 17:49:39 +0100 Subject: [PATCH] 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 --- apex/apex.go | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/apex/apex.go b/apex/apex.go index 0bca09394..1f0618750 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -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 }