summaryrefslogtreecommitdiff
path: root/cc/genrule.go
diff options
context:
space:
mode:
author Bill Peckham <bpeckham@google.com> 2020-08-31 16:07:58 -0700
committer Bill Peckham <bpeckham@google.com> 2020-09-02 22:27:45 +0000
commit945441c09ac8b638a0c54f1f7dbd4e934172d6f6 (patch)
tree5be77105e40577dd89770071ccd6c70803315cd2 /cc/genrule.go
parent3652018b83d7a46a937564aa0c981e0aee586fbd (diff)
Add exclude_from_vendor_snapshot property, related logic
When building a vendor snapshot, the general rule the build system uses to select a module for inclusion into the vendor snapshot is if it's a framework module. However, there are cases where a partner may modify the framework module, thereby assuming control of that module. This change adds the exclude_from_vendor_snapshot property allowing the partner to mark a module that would normally be included in the vendor snapshot for exclusion. This module is then built from source when building the vendor image against the vendor snapshot. Bug: 165705527 Test: m nothing Test: build partner code against vendor snapshot Change-Id: I6c5c15f13eeeb8f29717a4abd84b65fa72096889
Diffstat (limited to 'cc/genrule.go')
-rw-r--r--cc/genrule.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/cc/genrule.go b/cc/genrule.go
index 66d178456..cce4a83d3 100644
--- a/cc/genrule.go
+++ b/cc/genrule.go
@@ -84,7 +84,7 @@ func (g *GenruleExtraProperties) ExtraImageVariations(ctx android.BaseModuleCont
// If not, we assume modules under proprietary paths are compatible for
// BOARD_VNDK_VERSION. The other modules are regarded as AOSP, that is
// PLATFORM_VNDK_VERSION.
- if vndkVersion == "current" || !isVendorProprietaryPath(ctx.ModuleDir()) {
+ if vndkVersion == "current" || !isVendorProprietaryModule(ctx) {
variants = append(variants, VendorVariationPrefix+ctx.DeviceConfig().PlatformVndkVersion())
} else {
variants = append(variants, VendorVariationPrefix+vndkVersion)