Add product_available to product available modules

vendor_available modules were available to product modules.
However, not all vendor_available modules are required to be
available to product modules. Some modules want to be available only
to product modules but not vendor modules.

To cover the requirement, we separate product_available from
vendor_available.
vendor_available will not provide product available module.

Bug: 150902910
Test: build
Change-Id: I3fcce553f52fe98542b7c44711a75fc7d633997f

7 files changed, 9 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index 4d89cf8b1f14..be4d6d20da1c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -105,6 +105,7 @@ llvm_defaults {
 cc_library_headers {
     name: "llvm-headers-no-generated-headers",
     vendor_available: true,
+    product_available: true,
     host_supported: true,
     // TODO(b/153609531): remove when no longer needed.
     native_bridge_supported: true,
@@ -128,6 +129,7 @@ cc_library_headers {
 cc_library_headers {
     name: "llvm-headers",
     vendor_available: true,
+    product_available: true,
     host_supported: true,
     // TODO(b/153609531): remove when no longer needed.
     native_bridge_supported: true,
@@ -210,6 +212,7 @@ cc_library {
     host_supported: true,
     name: "libLLVM_android",
     vendor_available: true,
+    product_available: true,
     defaults: [
         "llvm-defaults",
         "force_build_llvm_components",
diff --git a/lib/Android.bp b/lib/Android.bp
index 5178d5cdcbcb..e5b0c5d1b140 100644
--- a/lib/Android.bp
+++ b/lib/Android.bp
@@ -1,6 +1,7 @@
 cc_defaults {
     name: "llvm-lib-defaults",
     vendor_available: true,
+    product_available: true,
     defaults: ["llvm-defaults"],
     cflags: [
         "-W",
diff --git a/lib/Support/Android.bp b/lib/Support/Android.bp
index d00de3f26799..5f147ea2780f 100644
--- a/lib/Support/Android.bp
+++ b/lib/Support/Android.bp
@@ -1,6 +1,7 @@
 cc_library_static {
     name: "libLLVMSupport",
     vendor_available: true,
+    product_available: true,
     defaults: ["llvm-defaults-no-generated-headers"],
     target: {
         // llvm-defaults turns off host builds by default, turn it back on for
diff --git a/lib/Target/AArch64/Android.bp b/lib/Target/AArch64/Android.bp
index 43110d29a9bc..b7af5d75018d 100644
--- a/lib/Target/AArch64/Android.bp
+++ b/lib/Target/AArch64/Android.bp
@@ -23,6 +23,7 @@ cc_defaults {
 cc_library_static {
     name: "llvm-aarch64-headers",
     vendor_available: true,
+    product_available: true,
     host_supported: true,
     // TODO(b/153609531): remove when no longer needed.
     native_bridge_supported: true,
diff --git a/lib/Target/ARM/Android.bp b/lib/Target/ARM/Android.bp
index b54d89898d4f..e2930622f89c 100644
--- a/lib/Target/ARM/Android.bp
+++ b/lib/Target/ARM/Android.bp
@@ -22,6 +22,7 @@ cc_defaults {
 cc_library_static {
     name: "llvm-arm-headers",
     vendor_available: true,
+    product_available: true,
     host_supported: true,
     // TODO(b/153609531): remove when no longer needed.
     native_bridge_supported: true,
diff --git a/lib/Target/Mips/Android.bp b/lib/Target/Mips/Android.bp
index f8c1abffd912..525d8b983c94 100644
--- a/lib/Target/Mips/Android.bp
+++ b/lib/Target/Mips/Android.bp
@@ -16,6 +16,7 @@ cc_defaults {
 cc_library_static {
     name: "llvm-mips-headers",
     vendor_available: true,
+    product_available: true,
     host_supported: true,
     // TODO(b/153609531): remove when no longer needed.
     native_bridge_supported: true,
diff --git a/lib/Target/X86/Android.bp b/lib/Target/X86/Android.bp
index 4e1b3f423cb9..24a983782e21 100644
--- a/lib/Target/X86/Android.bp
+++ b/lib/Target/X86/Android.bp
@@ -23,6 +23,7 @@ cc_defaults {
 cc_library_static {
     name: "llvm-x86-headers",
     vendor_available: true,
+    product_available: true,
     host_supported: true,
     // TODO(b/153609531): remove when no longer needed.
     native_bridge_supported: true,