From 72f9d6352e3293834fbcdc908b0576d301669d33 Mon Sep 17 00:00:00 2001
From: David Su <dysu@google.com>
Date: Mon, 10 Feb 2020 15:58:26 -0800
Subject: [PATCH] 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      | 6 ++++++
 wifi/Android.bp | 1 +
 2 files changed, 7 insertions(+)

diff --git a/Android.bp b/Android.bp
index b6483a0e3dc4e..d05c0b5724144 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1217,6 +1217,12 @@ java_library {
     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",
diff --git a/wifi/Android.bp b/wifi/Android.bp
index 5c9fb4e86bc7f..0c6cf1c170f52 100644
--- a/wifi/Android.bp
+++ b/wifi/Android.bp
@@ -89,6 +89,7 @@ java_library {
     ],
     srcs: [
         ":framework-wifi-updatable-sources",
+        ":framework-wifi-util-lib-aidls",
     ],
     // java_api_finder must accompany `srcs`
     plugins: ["java_api_finder"],