commit 753b9472c59c04f15251329914b9c2b6b516392d
author Jeff Sharkey <jsharkey@android.com> Wed Oct 25 05:30:54 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Oct 25 05:30:54 2017 +0000
tree 7ee12b4da1744ae9727b4ed9b4525cdb497a8fb7
parent 222107507d126c33bd48647fb92e0b4021fb861f
parent 46208530f8862f7dc770a4c24f1f39004c4fb36e

Move libwifikeystorehal to Android.bp. am: 6a1726a444
am: 46208530f8

Change-Id: I540494a88ca1197e6562ef2d76d6ae68e1915d21

current.txt

diff --git a/current.txt b/current.txt
index b425367..b373332 100644
--- 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

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