Drive instrumentation with build flag for C/C++ am: 10fff94e2e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3065602
Change-Id: Ie46b65da536109501103fd6cf85c3ab475a2de12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/android/apex_contributions.go b/android/apex_contributions.go
index dd09fbf..c76d9c2 100644
--- a/android/apex_contributions.go
+++ b/android/apex_contributions.go
@@ -115,6 +115,10 @@
func (a *allApexContributions) SetPrebuiltSelectionInfoProvider(ctx BaseModuleContext) {
addContentsToProvider := func(p *PrebuiltSelectionInfoMap, m *apexContributions) {
for _, content := range m.Contents() {
+ // Skip any apexes that have been added to the product specific ignore list
+ if InList(content, ctx.Config().BuildIgnoreApexContributionContents()) {
+ continue
+ }
// Coverage builds for TARGET_RELEASE=foo should always build from source,
// even if TARGET_RELEASE=foo uses prebuilt mainline modules.
// This is necessary because the checked-in prebuilts were generated with
@@ -137,19 +141,13 @@
}
p := PrebuiltSelectionInfoMap{}
- // Skip apex_contributions if BuildApexContributionContents is true
- // This product config var allows some products in the same family to use mainline modules from source
- // (e.g. shiba and shiba_fullmte)
- // Eventually these product variants will have their own release config maps.
- if !proptools.Bool(ctx.Config().BuildIgnoreApexContributionContents()) {
- ctx.VisitDirectDepsWithTag(acDepTag, func(child Module) {
- if m, ok := child.(*apexContributions); ok {
- addContentsToProvider(&p, m)
- } else {
- ctx.ModuleErrorf("%s is not an apex_contributions module\n", child.Name())
- }
- })
- }
+ ctx.VisitDirectDepsWithTag(acDepTag, func(child Module) {
+ if m, ok := child.(*apexContributions); ok {
+ addContentsToProvider(&p, m)
+ } else {
+ ctx.ModuleErrorf("%s is not an apex_contributions module\n", child.Name())
+ }
+ })
SetProvider(ctx, PrebuiltSelectionInfoProvider, p)
}
diff --git a/android/config.go b/android/config.go
index b60eb5c..fa465ae 100644
--- a/android/config.go
+++ b/android/config.go
@@ -2132,7 +2132,7 @@
return ret
}
-func (c *config) BuildIgnoreApexContributionContents() *bool {
+func (c *config) BuildIgnoreApexContributionContents() []string {
return c.productVariables.BuildIgnoreApexContributionContents
}
diff --git a/android/variable.go b/android/variable.go
index 599f88e..390c0fc 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -494,7 +494,7 @@
BuildFromSourceStub *bool `json:",omitempty"`
- BuildIgnoreApexContributionContents *bool `json:",omitempty"`
+ BuildIgnoreApexContributionContents []string `json:",omitempty"`
HiddenapiExportableStubs *bool `json:",omitempty"`