commit 107eb3bf4fcdbf77bce85c4afd2af4a89b87d116
author android-build-team Robot <android-build-team-robot@google.com> Sun Aug 06 07:35:20 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sun Aug 06 07:35:20 2017 +0000
tree 72b3c71758077c252e280e5525ef879f1c77e287
parent 37dfcbed624cc4f14a91b84e642100b4158b3a56
parent 992171f881e641d61a6889c5b5b72e9137edf748

release-request-d642586e-3e25-49f4-8b4c-acad0e3f63d8-for-git_oc-mr1-release-4249777 snap-temp-L81500000089724408

Change-Id: I50586aeb7c9bcc99a53c74bbb8c3a607db3501c0

net/netd/1.0/Android.bp

diff --git a/net/netd/1.0/Android.bp b/net/netd/1.0/Android.bp
index a585d20..0746efc 100644
--- a/net/netd/1.0/Android.bp
+++ b/net/netd/1.0/Android.bp
@@ -35,13 +35,16 @@
     ],
 }
 
-cc_library_shared {
+cc_library {
     name: "android.system.net.netd@1.0",
     defaults: ["hidl-module-defaults"],
     generated_sources: ["android.system.net.netd@1.0_genc++"],
     generated_headers: ["android.system.net.netd@1.0_genc++_headers"],
     export_generated_headers: ["android.system.net.netd@1.0_genc++_headers"],
     vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
     shared_libs: [
         "libhidlbase",
         "libhidltransport",

wifi/keystore/1.0/Android.bp

diff --git a/wifi/keystore/1.0/Android.bp b/wifi/keystore/1.0/Android.bp
index bf486f5..ae451c3 100644
--- a/wifi/keystore/1.0/Android.bp
+++ b/wifi/keystore/1.0/Android.bp
@@ -35,13 +35,16 @@
     ],
 }
 
-cc_library_shared {
+cc_library {
     name: "android.system.wifi.keystore@1.0",
     defaults: ["hidl-module-defaults"],
     generated_sources: ["android.system.wifi.keystore@1.0_genc++"],
     generated_headers: ["android.system.wifi.keystore@1.0_genc++_headers"],
     export_generated_headers: ["android.system.wifi.keystore@1.0_genc++_headers"],
     vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
     shared_libs: [
         "libhidlbase",
         "libhidltransport",