Merge "Mark llvm headers and libLLVMSupport as vendor_available" am: 779ebf305d
am: bf731e796f
Change-Id: I1175a7320f68a47281b7ced5918d66ca09b7185e
diff --git a/Android.bp b/Android.bp
index 2bc9f95..be72c0f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -103,6 +103,7 @@
cc_library_headers {
name: "llvm-headers-no-generated-headers",
+ vendor_available: true,
host_supported: true,
export_include_dirs: ["include"],
target: {
@@ -123,6 +124,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 9af201d..5178d5c 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"],
cflags: [
"-W",
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: {