commit 03074eb7094b024194f89c4304f70c9e357b7887
author Luke Huang <huangluke@google.com> Fri Nov 23 17:03:03 2018 +0800
committer Luke Huang <huangluke@google.com> Fri Dec 07 04:06:04 2018 +0000
tree f35618d7f0ab88dbacb4874ca3fdc6f55715de6f
parent 767a3e84867e1d65ae5ffd7e1a6165b4cc2476d0

Migrate INetd to stable aidl

Use stable aidl to serve INetd binder call.

Test: built, flashed, booted
      system/netd/tests/runtests.sh passes

Change-Id: Iae280db1660cdd142886a51531dd1d4993e7a77b

server/Android.bp

diff --git a/server/Android.bp b/server/Android.bp
index 99164d8..600d80f 100644
--- a/server/Android.bp
+++ b/server/Android.bp
@@ -1,10 +1,3 @@
-// AIDL interface between netd and framework.jar
-filegroup {
-    name: "netd_aidl",
-    srcs: ["binder/android/net/INetd.aidl"],
-    path: "binder",
-}
-
 // AIDL interface between netd and services.core
 filegroup {
     name: "netd_metrics_aidl",
@@ -30,9 +23,10 @@
     name: "netd_aidl_interface",
     local_include_dir: "binder",
     srcs: [
+        "binder/android/net/INetd.aidl",
+        "binder/android/net/InterfaceConfigurationParcel.aidl",
         "binder/android/net/TetherStatsParcel.aidl",
         "binder/android/net/UidRangeParcel.aidl",
-        "binder/android/net/InterfaceConfigurationParcel.aidl",
     ],
     api_dir: "binder/api",
     // NDK doesn't support array now.
@@ -43,28 +37,6 @@
     },
 }
 
-cc_library {
-    name: "libnetdaidl",
-    defaults: ["netd_defaults"],
-    shared_libs: [
-        "libbinder",
-        "libutils",
-        "netd_aidl_interface-cpp",
-    ],
-    export_shared_lib_headers: [
-        "netd_aidl_interface-cpp",
-    ],
-    aidl: {
-        export_aidl_headers: true,
-        local_include_dirs: ["binder"],
-        include_dirs: ["frameworks/native/aidl/binder"],
-    },
-    srcs: [
-        ":netd_aidl",
-    ],
-    export_include_dirs: ["binder"],
-}
-
 // Modules common to both netd and netd_unit_test
 cc_library_static {
     name: "libnetd_server",
@@ -100,7 +72,6 @@
     shared_libs: [
         "libbpf_android",
         "libnetd_resolv",
-        "libnetdaidl",
         "libbase",
         "libbinder",
         "liblogwrap",
@@ -110,6 +81,7 @@
         "libpcap",
         "libqtaguid",
         "libssl",
+        "netd_aidl_interface-cpp",
     ],
     aidl: {
         export_aidl_headers: true,
@@ -140,7 +112,6 @@
         "liblogwrap",
         "libmdnssd",
         "libnetd_resolv",
-        "libnetdaidl",
         "libnetdbpf",
         "libnetdutils",
         "libnetutils",
@@ -226,7 +197,6 @@
         "libcrypto",
         "libcutils",
         "liblog",
-        "libnetdaidl",
         "libnetdbpf",
         "libnetdutils",
         "libnetutils",