commit 72f9d6352e3293834fbcdc908b0576d301669d33
author David Su <dysu@google.com> Mon Feb 10 15:58:26 2020 -0800
committer Anton Hansson <hansson@google.com> Thu Feb 20 15:06:24 2020 +0000
tree 05fb5f65322b9c03060b63aadd7cd68ec65378fe
parent 940f172ecf292fcc4e84341d2cb953e4884175a7

framework-wifi: Stop linking all frameworks/base/core/java AIDLs

Instead only link ParceledListSlice.aidl,
which is the only one used by
framework-wifi.

Bug: 149127842
Test: "couldn't find import for class android.content.pm.ParceledListSlice"
no longer appears when building

Change-Id: Ie9f67c58c3694bbf1f45ae8e1d99e6e65fbc3163

Android.bp

diff --git a/Android.bp b/Android.bp
index b6483a0..d05c0b5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1217,6 +1217,12 @@
     visibility: ["//frameworks/base/wifi"],
 }
 
+filegroup {
+    name: "framework-wifi-util-lib-aidls",
+    srcs: ["core/java/android/content/pm/ParceledListSlice.aidl"],
+    path: "core/java",
+}
+
 // utility classes statically linked into wifi-service
 filegroup {
     name: "framework-wifi-service-shared-srcs",

wifi/Android.bp

diff --git a/wifi/Android.bp b/wifi/Android.bp
index 5c9fb4e..0c6cf1c 100644
--- a/wifi/Android.bp
+++ b/wifi/Android.bp
@@ -89,6 +89,7 @@
     ],
     srcs: [
         ":framework-wifi-updatable-sources",
+        ":framework-wifi-util-lib-aidls",
     ],
     // java_api_finder must accompany `srcs`
     plugins: ["java_api_finder"],