From aeb68e86e4e335d4b201c46099cc2ce1256beec2 Mon Sep 17 00:00:00 2001
From: Justin Yun <justinyun@google.com>
Date: Mon, 31 Jul 2017 15:41:10 +0900
Subject: [PATCH] Mark the modules as VNDK-SP in Android.bp

As a VNDK-SP module, Android.bp must have 'vndk' tag as well as
'vendor_available: true'.

The 'vndk' tag for VNDK-SP formated as follows:
vndk: {
    enabled: true,
    support_system_process: true,
},

VNDK-SP modules will be installed both in system/lib(64) as normal
and in system/lib(64)/vndk-sp as a vendor variant.

Bug: 63866913
Test: build and boot with BOARD_VNDK_VERSION=current
Change-Id: I51fe0859f63ad58b7b91909e7d7d4206443228cd
---
 base/Android.bp         | 4 ++++
 libbacktrace/Android.bp | 4 ++++
 libcutils/Android.bp    | 4 ++++
 libion/Android.bp       | 6 +++++-
 libutils/Android.bp     | 4 ++++
 5 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/base/Android.bp b/base/Android.bp
index b636dc31c..6c3a593a7 100644
--- a/base/Android.bp
+++ b/base/Android.bp
@@ -41,6 +41,10 @@ cc_library {
     vendor_available: true,
     clang: true,
     host_supported: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
     srcs: [
         "file.cpp",
         "logging.cpp",
diff --git a/libbacktrace/Android.bp b/libbacktrace/Android.bp
index e02aaf216..7eefc95af 100644
--- a/libbacktrace/Android.bp
+++ b/libbacktrace/Android.bp
@@ -64,6 +64,10 @@ cc_library_headers {
 cc_library {
     name: "libbacktrace",
     vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
     defaults: ["libbacktrace_common"],
     host_supported: true,
 
diff --git a/libcutils/Android.bp b/libcutils/Android.bp
index 245deb113..56a0cca6d 100644
--- a/libcutils/Android.bp
+++ b/libcutils/Android.bp
@@ -50,6 +50,10 @@ cc_library_headers {
 cc_library {
     name: "libcutils",
     vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
     host_supported: true,
     srcs: [
         "config_utils.c",
diff --git a/libion/Android.bp b/libion/Android.bp
index 6f267e4c7..6d9fae076 100644
--- a/libion/Android.bp
+++ b/libion/Android.bp
@@ -1,7 +1,11 @@
 
 cc_library {
     name: "libion",
-		vendor_available: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
     srcs: ["ion.c"],
     shared_libs: ["liblog"],
     local_include_dirs: [
diff --git a/libutils/Android.bp b/libutils/Android.bp
index 9e7cc138c..a779a8ccf 100644
--- a/libutils/Android.bp
+++ b/libutils/Android.bp
@@ -46,6 +46,10 @@ cc_library_headers {
 cc_library {
     name: "libutils",
     vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
     host_supported: true,
 
     srcs: [