release-request-e73a0a41-91c3-4249-808e-8d196d54a344-for-git_oc-mr1-release-4273744 snap-temp-L04700000093069831android-wear-8.1.0_r1android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r14android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-security-8.1.0_r93android-security-8.1.0_r92android-security-8.1.0_r91android-security-8.1.0_r90android-security-8.1.0_r89android-security-8.1.0_r88android-security-8.1.0_r87android-security-8.1.0_r86android-security-8.1.0_r85android-security-8.1.0_r84android-security-8.1.0_r83android-security-8.1.0_r82android-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r25android-cts-8.1_r24android-cts-8.1_r23android-cts-8.1_r22android-cts-8.1_r21android-cts-8.1_r20android-cts-8.1_r2android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10android-cts-8.1_r1android-8.1.0_r9android-8.1.0_r81android-8.1.0_r80android-8.1.0_r8android-8.1.0_r79android-8.1.0_r78android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70android-8.1.0_r7android-8.1.0_r69android-8.1.0_r68android-8.1.0_r67android-8.1.0_r66android-8.1.0_r65android-8.1.0_r64android-8.1.0_r63android-8.1.0_r62android-8.1.0_r61android-8.1.0_r60android-8.1.0_r6android-8.1.0_r53android-8.1.0_r52android-8.1.0_r51android-8.1.0_r50android-8.1.0_r5android-8.1.0_r48android-8.1.0_r47android-8.1.0_r46android-8.1.0_r45android-8.1.0_r43android-8.1.0_r42android-8.1.0_r41android-8.1.0_r40android-8.1.0_r4android-8.1.0_r39android-8.1.0_r38android-8.1.0_r37android-8.1.0_r36android-8.1.0_r35android-8.1.0_r33android-8.1.0_r32android-8.1.0_r31android-8.1.0_r30android-8.1.0_r3android-8.1.0_r29android-8.1.0_r28android-8.1.0_r27android-8.1.0_r26android-8.1.0_r25android-8.1.0_r23android-8.1.0_r22android-8.1.0_r21android-8.1.0_r20android-8.1.0_r2android-8.1.0_r19android-8.1.0_r18android-8.1.0_r17android-8.1.0_r16android-8.1.0_r15android-8.1.0_r14android-8.1.0_r13android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1security-oc-mr1-releaseoreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-m8-releaseoreo-m7-releaseoreo-m6-s4-releaseoreo-m6-s3-releaseoreo-m6-s2-releaseoreo-m5-releaseoreo-m4-s9-releaseoreo-m4-s8-releaseoreo-m4-s7-releaseoreo-m4-s6-releaseoreo-m4-s5-releaseoreo-m4-s4-releaseoreo-m4-s3-releaseoreo-m4-s2-releaseoreo-m4-s12-releaseoreo-m4-s11-releaseoreo-m4-s10-releaseoreo-m4-s1-releaseoreo-m3-releaseoreo-m2-s5-releaseoreo-m2-s4-releaseoreo-m2-s3-releaseoreo-m2-s2-releaseoreo-m2-s1-releaseoreo-m2-release

Change-Id: Id2c58ccdb18f36525321780e79c6e63493303a93

7 files changed, 8 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index e3d13978b16a..ff2f7bdd9ea4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -97,6 +97,7 @@ llvm_defaults {
 
 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 {
 
 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 33b2cf28c297..127ba59ce3c3 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 0d4f93dbd437..d00de3f26799 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 8de4468a2392..6f23095a2cfa 100644
--- a/lib/Target/AArch64/Android.bp
+++ b/lib/Target/AArch64/Android.bp
@@ -22,6 +22,7 @@ cc_defaults {
 
 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 56e208b51922..9f7f0db8c157 100644
--- a/lib/Target/ARM/Android.bp
+++ b/lib/Target/ARM/Android.bp
@@ -21,6 +21,7 @@ cc_defaults {
 
 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 2ce4f8bda91d..8e1a99d55e6f 100644
--- a/lib/Target/Mips/Android.bp
+++ b/lib/Target/Mips/Android.bp
@@ -15,6 +15,7 @@ cc_defaults {
 
 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 9ca246c7e57f..efcbc079828a 100644
--- a/lib/Target/X86/Android.bp
+++ b/lib/Target/X86/Android.bp
@@ -22,6 +22,7 @@ cc_defaults {
 
 cc_library_static {
     name: "llvm-x86-headers",
+    vendor_available: true,
     host_supported: true,
     target: {
         windows: {