Update for Soong java makefiles. am: e117602ffe am: e6bd7bf804

am: 553d2f3062

Change-Id: Ib88c75d3c48d4f3137122d949a18723a34333a2f

diff --git a/current.txt b/current.txt
index b425367..b373332 100644 (file)
--- a/current.txt
+++ b/current.txt
@@ -3,5 +3,8 @@
 
 # Frameworks HALs released in Android O
 
-
 b0ff0dc756845dd132f998e8c55f1a0d7e3efd8aa85f6253776fb7012814524b android.system.wifi.keystore@1.0::IKeystore
+
+# Frameworks HALs released in Android O-MR1
+
+2cfd7918acf09462fe8fe3f5608be2956c9f737c78d3bb3f176cc5531c09f5d6 android.system.net.netd@1.0::INetd

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