Revert "Fix missing headers of vendor snapshot"
This reverts commit b6a586241eba57775b3fc952b1b06b398a4dff68.
Reason for revert: b/157737963
Change-Id: Ic72e14ba2d8c3bfbc61906bf668a3e56619f04a4
diff --git a/cc/vendor_snapshot.go b/cc/vendor_snapshot.go
index 1ff617f..5801fc7 100644
--- a/cc/vendor_snapshot.go
+++ b/cc/vendor_snapshot.go
@@ -443,7 +443,7 @@
return false
}
// the module must be installed in /vendor
- if !m.IsForPlatform() || m.isSnapshotPrebuilt() || !m.inVendor() {
+ if !m.installable() || m.isSnapshotPrebuilt() || !m.inVendor() {
return false
}
// exclude test modules
@@ -457,17 +457,12 @@
// Libraries
if l, ok := m.linker.(snapshotLibraryInterface); ok {
- // header libraries are not installable, but captured.
- if (l.static() || l.shared()) && !m.installable() {
- return false
- }
if l.static() {
return proptools.BoolDefault(m.VendorProperties.Vendor_available, true)
}
if l.shared() {
return !m.IsVndk()
}
-
return true
}