From 55404a0d1fd034d6f5b41aa2e1f2c4aea541330a Mon Sep 17 00:00:00 2001
From: Jiyong Park <jiyong@google.com>
Date: Thu, 10 Aug 2017 20:09:55 +0900
Subject: Mark llvm headers and libLLVMSupport as vendor_available

They are depended by libbcinfo which is a VNDK-SP library.
Since they are headers and static library, vendor_available: true is
enough.

Bug: 64425518
Test: BOARD_VNDK_VERSION=current m -j libbcinfo.vendor

Change-Id: I4415abb6779776758e780a008c560cbb4ef2c020
---
 Android.bp                    | 2 ++
 lib/Android.bp                | 1 +
 lib/Support/Android.bp        | 1 +
 lib/Target/AArch64/Android.bp | 1 +
 lib/Target/ARM/Android.bp     | 1 +
 lib/Target/Mips/Android.bp    | 1 +
 lib/Target/X86/Android.bp     | 1 +
 7 files changed, 8 insertions(+)

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: {
-- 
cgit v1.2.3