Merge "Mark libbcinfo as VNDK-SP" am: bd81d39847
am: 4855f0b2e8

Change-Id: I2093c54945e2a87e681341026712b5a10bb9c5dd
diff --git a/bcinfo/Android.bp b/bcinfo/Android.bp
index 4db32c8..7695fba 100644
--- a/bcinfo/Android.bp
+++ b/bcinfo/Android.bp
@@ -16,6 +16,11 @@
 
 cc_library_shared {
     name: "libbcinfo",
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
     host_supported: true,
     defaults: [
         "llvm-defaults",
@@ -102,6 +107,7 @@
 
 cc_library_headers {
     name: "libbcinfo-headers",
+    vendor_available: true,
     host_supported: true,
     export_include_dirs: ["include"],
     target: {
diff --git a/bcinfo/BitReader_2_7/Android.bp b/bcinfo/BitReader_2_7/Android.bp
index d0f178d..3003ff0 100644
--- a/bcinfo/BitReader_2_7/Android.bp
+++ b/bcinfo/BitReader_2_7/Android.bp
@@ -1,5 +1,6 @@
 cc_library_static {
     name: "libLLVMBitReader_2_7",
+    vendor_available: true,
     defaults: ["llvm-defaults",],
     host_supported: true,
 
diff --git a/bcinfo/BitReader_3_0/Android.bp b/bcinfo/BitReader_3_0/Android.bp
index cd19678..858d2d0 100644
--- a/bcinfo/BitReader_3_0/Android.bp
+++ b/bcinfo/BitReader_3_0/Android.bp
@@ -1,5 +1,6 @@
 cc_library_static {
     name: "libLLVMBitReader_3_0",
+    vendor_available: true,
     defaults: ["llvm-defaults"],
     host_supported: true,
 
diff --git a/bcinfo/Wrap/Android.bp b/bcinfo/Wrap/Android.bp
index 6334a5e..7419779 100644
--- a/bcinfo/Wrap/Android.bp
+++ b/bcinfo/Wrap/Android.bp
@@ -16,6 +16,7 @@
 
 cc_library_static {
     name: "libLLVMWrap",
+    vendor_available: true,
     host_supported: true,
 
     srcs: [
@@ -37,5 +38,5 @@
         },
     },
 
-    header_libs: ["libbcinfo-headers"],
+    header_libs: ["libbcinfo-headers", "liblog_headers"],
 }