diff options
| author | 2020-01-15 20:50:43 +0000 | |
|---|---|---|
| committer | 2020-01-15 20:50:43 +0000 | |
| commit | 03e42a6d68a8620df3dcb8cc89e729301249eaed (patch) | |
| tree | 821278ec7d8fb7474fa15ffa5fe2928803e77c59 | |
| parent | 537d8d9e2bcdc7361bf9a0c14b32d606b7d3881d (diff) | |
Revert "framework-wifi: clean up AIDL exports"
This reverts commit 537d8d9e2bcdc7361bf9a0c14b32d606b7d3881d.
Reason for revert: Broke build
Change-Id: Ia69c60050203b1124baf8d1304e837854a1f8bc9
| -rw-r--r-- | Android.bp | 1 | ||||
| -rw-r--r-- | wifi/Android.bp | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp index b52a4e11cd17..4e2b156afbbf 100644 --- a/Android.bp +++ b/Android.bp @@ -303,6 +303,7 @@ java_defaults { "sax/java", "telecomm/java", "telephony/java", + "wifi/java", ], }, diff --git a/wifi/Android.bp b/wifi/Android.bp index d14a726eed5d..70c9befce66a 100644 --- a/wifi/Android.bp +++ b/wifi/Android.bp @@ -113,8 +113,6 @@ 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"], }, @@ -126,6 +124,11 @@ 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, |