From c6513592004e4ac68c07e6fb97965e9ef133e54d Mon Sep 17 00:00:00 2001
From: David Su <dysu@google.com>
Date: Wed, 15 Jan 2020 22:55:20 +0000
Subject: [PATCH] framework-wifi: clean up AIDL exports (Attempt 2)

Remove AIDL exports to not leak internal
implementation as AIDL is not an official API
of the Wifi module.

Previous attempt broke the build.

Bug: 147757606
Change-Id: I2edeeccf83b9460881c5d4ccc6bd5d6e3befa700
Test: compiles
---
 Android.bp      | 1 -
 wifi/Android.bp | 7 ++-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/Android.bp b/Android.bp
index 1ddfbe58b4458..06e2ed7f7415f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -306,7 +306,6 @@ java_defaults {
             "rs/java",
             "sax/java",
             "telecomm/java",
-            "wifi/java",
         ],
     },
 
diff --git a/wifi/Android.bp b/wifi/Android.bp
index 76ccc68908d15..2f9979453f387 100644
--- a/wifi/Android.bp
+++ b/wifi/Android.bp
@@ -123,6 +123,8 @@ droidstubs {
         ":framework-annotations",
         ":framework-wifi-updatable-sources",
     ],
+    // This is needed as IOnWifiActivityEnergyInfoListener.aidl in framework-wifi depends on
+    // WifiActivityEnergyInfo.aidl in framework-minus-apex
     aidl: {
         include_dirs: ["frameworks/base/core/java"],
     },
@@ -134,11 +136,6 @@ droidstubs {
 java_library {
     name: "framework-wifi-stubs",
     srcs: [":framework-wifi-stubs-srcs"],
-    aidl: {
-        export_include_dirs: [
-            "java",
-        ],
-    },
     sdk_version: "core_current",
     libs: ["android_system_stubs_current"],
     installable: false,