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

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

Change-Id: Ic6c42f8fe0cd69dec16e3dd52df91dde1b7ef0ad

cc/vendor_snapshot.go

@@ -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