Update make file for vndk enabled.

Update the Android.bp generated with hidl-gen.

Bug: 63866913
Test: build with and without BOARD_VNDK_VERSION=current
Change-Id: I8a62bba1a9538dcc71ccc0cc0586d9e07fa85f96

diff --git a/net/netd/1.0/Android.bp b/net/netd/1.0/Android.bp
index a585d20..0746efc 100644 (file)
--- a/net/netd/1.0/Android.bp
+++ b/net/netd/1.0/Android.bp
@@ -35,13 +35,16 @@ genrule {
     ],
 }
 
-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",

diff --git a/wifi/keystore/1.0/Android.bp b/wifi/keystore/1.0/Android.bp
index bf486f5..ae451c3 100644 (file)
--- a/wifi/keystore/1.0/Android.bp
+++ b/wifi/keystore/1.0/Android.bp
@@ -35,13 +35,16 @@ genrule {
     ],
 }
 
-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",