commit 4f9c322686d6d22b62d738ebea062c3a2517623a
author Bernie Innocenti <codewiz@google.com> Fri Oct 12 17:00:51 2018 +0900
committer Bernie Innocenti <codewiz@google.com> Tue Oct 23 03:54:53 2018 +0000
tree ac0b1e70efbbd9f48f1ff8ec40d28536c7d49f18
parent 7b69492d8212d056418032311ee5a675bf7e6578

Re-export netd_aidl_interface-cpp headers from libnetdaidl

INetd.h (part of libnetdaidl) transitivly includes
android/net/TetherStatsParcel.h, which is in the
netd_aidl_interface-cpp include path. This change re-exports this
include path from libnetdaidl, avoiding the need to explicitly depend
on the transitive dependency in various binaries.

Test: netd ndc bpfloader libnetd_client netd_integration_test netd_unit_test netd_benchmark
Change-Id: I3b396e7543cea2d49422d8ab631b1c94addc1777

server/Android.bp

diff --git a/server/Android.bp b/server/Android.bp
index dc8a3cc..2f8ee89 100644
--- a/server/Android.bp
+++ b/server/Android.bp
@@ -43,6 +43,9 @@
         "libutils",
         "netd_aidl_interface-cpp",
     ],
+    export_shared_lib_headers: [
+        "netd_aidl_interface-cpp",
+    ],
     aidl: {
         export_aidl_headers: true,
         local_include_dirs: ["binder"],
@@ -99,7 +102,6 @@
         "libpcap",
         "libqtaguid",
         "libssl",
-        "netd_aidl_interface-cpp",
     ],
     aidl: {
         export_aidl_headers: true,
@@ -226,6 +228,5 @@
         "libqtaguid",
         "libsysutils",
         "libutils",
-        "netd_aidl_interface-cpp",
     ],
 }