openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Heed SkipInstall flag when adding install rules for vendor-snapshot. 

The prebuilt-vs-source selection operates by setting SkipInstall on
either module. When the vendor-snapshot module visits all modules it
will visit both, and if it is a static library it will then add
duplicate install rules for both source and prebuilt unless it
looks at SkipInstall.

Test: `m nothing` in a tree with prebuilts/runtime present, that
  has been updated with a snapshot after https://r.android.com/1398472,
  which started to propagate vendor_available flags to prebuilts
  snapshots.
Bug: 151303681
Change-Id: Ie425f0115e4180b7f4a8e682696697d55d666845
This commit is contained in:
Martin Stjernholm 2020-09-10 01:46:05 +01:00
parent 6b5430203c
commit 809d51866a
1 changed files with 5 additions and 0 deletions
Show Stats 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 { if !m.Enabled() || m.Properties.HideFromMake {
return false 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) // skip proprietary modules, but include all VNDK (static)
if inVendorProprietaryPath && !m.IsVndk() { if inVendorProprietaryPath && !m.IsVndk() {
return false return false