summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Yun <justinyun@google.com>2017-07-24 15:19:45 +0900
committerJae Shin <jaeshin@google.com>2017-09-14 08:35:16 +0000
commit6a7e8823165dbe2e60caac9a8e09a9de7f3a157e (patch)
tree6b048b89df29070c67d363eeb3a4e24f5ad1825c
parente997ba9d22cfaadb20f990b6840934e2b25acd89 (diff)
downloadcore-6a7e8823165dbe2e60caac9a8e09a9de7f3a157e.tar.gz
core-6a7e8823165dbe2e60caac9a8e09a9de7f3a157e.tar.bz2
core-6a7e8823165dbe2e60caac9a8e09a9de7f3a157e.zip
Mark the modules as VNDK in Android.bp
As a VNDK module, Android.bp must have 'vndk' tag as well as 'vendor_available: true'. The 'vndk' tag for VNDK module is formated as below: vndk: { enabled: true, }, VNDK modules will be installed both in system/lib(64) as normal and in system/lib(64)/vndk as a vendor variant. Bug: 63866913 Test: build and boot with BOARD_VNDK_VERSION=current Merged-In: Icecb22ed2ed0f58c3168605d4cf64815e2dda750 Change-Id: Icecb22ed2ed0f58c3168605d4cf64815e2dda750 (cherry picked from commit 9b0ed7294273d5f10020388e5a5b7e545a2fd1de)
-rw-r--r--libcrypto_utils/Android.bp3
-rw-r--r--libdiskconfig/Android.bp3
-rw-r--r--libnetutils/Android.bp3
-rw-r--r--libprocinfo/Android.bp3
-rw-r--r--libsuspend/Android.bp3
-rw-r--r--libsysutils/Android.bp3
-rw-r--r--libusbhost/Android.bp4
7 files changed, 22 insertions, 0 deletions
diff --git a/libcrypto_utils/Android.bp b/libcrypto_utils/Android.bp
index 4a5f2a7ac..47de12ab0 100644
--- a/libcrypto_utils/Android.bp
+++ b/libcrypto_utils/Android.bp
@@ -17,6 +17,9 @@
cc_library {
name: "libcrypto_utils",
vendor_available: true,
+ vndk: {
+ enabled: true,
+ },
host_supported: true,
srcs: [
"android_pubkey.c",
diff --git a/libdiskconfig/Android.bp b/libdiskconfig/Android.bp
index 088981a7c..23a5c79d0 100644
--- a/libdiskconfig/Android.bp
+++ b/libdiskconfig/Android.bp
@@ -1,6 +1,9 @@
cc_library {
name: "libdiskconfig",
vendor_available: true,
+ vndk: {
+ enabled: true,
+ },
srcs: [
"diskconfig.c",
"diskutils.c",
diff --git a/libnetutils/Android.bp b/libnetutils/Android.bp
index 9967ef886..1d43775d6 100644
--- a/libnetutils/Android.bp
+++ b/libnetutils/Android.bp
@@ -1,6 +1,9 @@
cc_library_shared {
name: "libnetutils",
vendor_available: true,
+ vndk: {
+ enabled: true,
+ },
srcs: [
"dhcpclient.c",
diff --git a/libprocinfo/Android.bp b/libprocinfo/Android.bp
index aedaa3867..b568ee5da 100644
--- a/libprocinfo/Android.bp
+++ b/libprocinfo/Android.bp
@@ -23,6 +23,9 @@ libprocinfo_cppflags = [
cc_library {
name: "libprocinfo",
vendor_available: true,
+ vndk: {
+ enabled: true,
+ },
host_supported: true,
srcs: [
"process.cpp",
diff --git a/libsuspend/Android.bp b/libsuspend/Android.bp
index 130800ed8..32f1e1ff8 100644
--- a/libsuspend/Android.bp
+++ b/libsuspend/Android.bp
@@ -3,6 +3,9 @@
cc_library {
name: "libsuspend",
vendor_available: true,
+ vndk: {
+ enabled: true,
+ },
srcs: [
"autosuspend.c",
diff --git a/libsysutils/Android.bp b/libsysutils/Android.bp
index 550ef4233..d076a1ae3 100644
--- a/libsysutils/Android.bp
+++ b/libsysutils/Android.bp
@@ -1,6 +1,9 @@
cc_library_shared {
name: "libsysutils",
vendor_available: true,
+ vndk: {
+ enabled: true,
+ },
srcs: [
"src/SocketListener.cpp",
diff --git a/libusbhost/Android.bp b/libusbhost/Android.bp
index a0d6b9b85..fc6f305c0 100644
--- a/libusbhost/Android.bp
+++ b/libusbhost/Android.bp
@@ -16,6 +16,10 @@
cc_library {
name: "libusbhost",
+ vendor_available: true,
+ vndk: {
+ enabled: true,
+ },
host_supported: true,
srcs: ["usbhost.c"],
cflags: ["-Werror"],