release-request-e73a0a41-91c3-4249-808e-8d196d54a344-for-git_oc-mr1-release-4273744 snap-temp-L04700000093069831

Change-Id: Id2c58ccdb18f36525321780e79c6e63493303a93
diff --git a/Android.bp b/Android.bp
index e3d1397..ff2f7bd 100644
--- a/Android.bp
+++ b/Android.bp
@@ -97,6 +97,7 @@
 
 cc_library_headers {
     name: "llvm-headers-no-generated-headers",
+    vendor_available: true,
     host_supported: true,
     export_include_dirs: ["include"],
     target: {
@@ -117,6 +118,7 @@
 
 cc_library_headers {
     name: "llvm-headers",
+    vendor_available: true,
     host_supported: true,
     header_libs: ["llvm-headers-no-generated-headers"],
     export_header_lib_headers: ["llvm-headers-no-generated-headers"],
diff --git a/lib/Android.bp b/lib/Android.bp
index 33b2cf2..127ba59 100644
--- a/lib/Android.bp
+++ b/lib/Android.bp
@@ -1,5 +1,6 @@
 cc_defaults {
     name: "llvm-lib-defaults",
+    vendor_available: true,
     defaults: ["llvm-defaults"],
     export_header_lib_headers: ["llvm-headers"],
     target: {
diff --git a/lib/Support/Android.bp b/lib/Support/Android.bp
index 0d4f93d..d00de3f 100644
--- a/lib/Support/Android.bp
+++ b/lib/Support/Android.bp
@@ -1,5 +1,6 @@
 cc_library_static {
     name: "libLLVMSupport",
+    vendor_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 8de4468..6f23095 100644
--- a/lib/Target/AArch64/Android.bp
+++ b/lib/Target/AArch64/Android.bp
@@ -22,6 +22,7 @@
 
 cc_library_static {
     name: "llvm-aarch64-headers",
+    vendor_available: true,
     host_supported: true,
     target: {
         windows: {
diff --git a/lib/Target/ARM/Android.bp b/lib/Target/ARM/Android.bp
index 56e208b..9f7f0db 100644
--- a/lib/Target/ARM/Android.bp
+++ b/lib/Target/ARM/Android.bp
@@ -21,6 +21,7 @@
 
 cc_library_static {
     name: "llvm-arm-headers",
+    vendor_available: true,
     host_supported: true,
     target: {
         windows: {
diff --git a/lib/Target/Mips/Android.bp b/lib/Target/Mips/Android.bp
index 2ce4f8b..8e1a99d 100644
--- a/lib/Target/Mips/Android.bp
+++ b/lib/Target/Mips/Android.bp
@@ -15,6 +15,7 @@
 
 cc_library_static {
     name: "llvm-mips-headers",
+    vendor_available: true,
     host_supported: true,
     target: {
         windows: {
diff --git a/lib/Target/X86/Android.bp b/lib/Target/X86/Android.bp
index 9ca246c..efcbc07 100644
--- a/lib/Target/X86/Android.bp
+++ b/lib/Target/X86/Android.bp
@@ -22,6 +22,7 @@
 
 cc_library_static {
     name: "llvm-x86-headers",
+    vendor_available: true,
     host_supported: true,
     target: {
         windows: {