diff options
| author | 2020-01-17 21:06:49 +0000 | |
|---|---|---|
| committer | 2020-01-17 21:06:49 +0000 | |
| commit | 36a63e59a5249627e6e60433060229285487917a (patch) | |
| tree | 2d649c9722ff81095dfd78620d17b607b60a2160 | |
| parent | e796b879e9fec5921ce24d4a0494dee8d2f5f2da (diff) | |
| parent | c6513592004e4ac68c07e6fb97965e9ef133e54d (diff) | |
Merge "framework-wifi: clean up AIDL exports (Attempt 2)"
| -rw-r--r-- | Android.bp | 1 | ||||
| -rw-r--r-- | wifi/Android.bp | 7 |
2 files changed, 2 insertions, 6 deletions
diff --git a/Android.bp b/Android.bp index 6c640b32277d..8ceebb790717 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 4c9ee854536e..5ef892d005ac 100644 --- a/wifi/Android.bp +++ b/wifi/Android.bp @@ -114,6 +114,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"], }, @@ -125,11 +127,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, |