StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Heed SkipInstall flag when adding install rules for vendor-snapshot." am: 386821fae7 am: f6173cf1d2 am: c61d5f2904 am: d89e03f730

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

Change-Id: I77e561bf158f1191696fdb33f38e11804a734a90
This commit is contained in:
Treehugger Robot
2020-09-15 18:59:32 +00:00
committed by Automerger Merge Worker
parent 1e9a25a9ea d89e03f730
commit 8cc652f6fc
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cc/vendor_snapshot.go
View File

@@ -541,6 +541,11 @@ func isVendorSnapshotModule(m *Module, inVendorProprietaryPath bool) bool {
if !m.Enabled() || m.Properties.HideFromMake {
return false
}
// When android/prebuilt.go selects between source and prebuilt, it sets
// SkipInstall on the other one to avoid duplicate install rules in make.
if m.IsSkipInstall() {
return false
}
// skip proprietary modules, but include all VNDK (static)
if inVendorProprietaryPath && !m.IsVndk() {
return false