commit a38b204683a62aaeb4d77cf4f7938ee41e92317c
author android-build-team Robot <android-build-team-robot@google.com> Sun Aug 06 08:10:48 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sun Aug 06 08:10:48 2017 +0000
tree 72b3c71758077c252e280e5525ef879f1c77e287
parent 1413285301d65d53475ea0e013bbbe44cc58a6c4
parent 1d8fe7c8bb9bccb1d7648b3ab841be9ec419a966

release-request-64fc473b-7e45-48f5-b2f7-3c916e338608-for-git_pi-release-4249735 snap-temp-L34700000089732387

Change-Id: Ia4dd4023fc3c06c1e5c816a338a85b6cbaa91111

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",