summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author David Su <dysu@google.com> 2020-01-16 02:43:21 +0000
committer David Su <dysu@google.com> 2020-01-16 02:43:21 +0000
commitc865b21d4b68af94fe28a8a09d4a934bd5aa3b1d (patch)
treef8fb305f0305be08e26e44132caeb8ea79e55ab8
parenteb2572959a6d89c14c9ba1de23a9ef561eb87e15 (diff)
Revert "framework.jar - include framework-wifi-stubs instead of framework-wifi"
This reverts commit eb2572959a6d89c14c9ba1de23a9ef561eb87e15. Reason for revert: Broke build Change-Id: I694c84dec6ae47a6c86fa1036802cdd750490efc
-rw-r--r--Android.bp6
-rw-r--r--wifi/Android.bp1
2 files changed, 4 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp
index d542502c918b..a7ac094e1b56 100644
--- a/Android.bp
+++ b/Android.bp
@@ -491,7 +491,8 @@ java_library {
"framework-sdkextensions-stubs-systemapi",
// TODO(b/146167933): Use framework-statsd-stubs instead.
"framework-statsd",
- "framework-wifi-stubs",
+ // TODO(b/140299412): should be framework-wifi-stubs
+ "framework-wifi",
"ike-stubs",
// TODO(b/147200698): should be the stub of framework-tethering
"framework-tethering",
@@ -527,8 +528,7 @@ java_library {
"compat-changeid-annotation-processor",
],
static_libs: [
- "exoplayer2-core",
- "android.hardware.wifi-V1.0-java-constants",
+ "exoplayer2-core"
]
}
diff --git a/wifi/Android.bp b/wifi/Android.bp
index 791da3051ca2..70c9befce66a 100644
--- a/wifi/Android.bp
+++ b/wifi/Android.bp
@@ -97,6 +97,7 @@ java_library {
},
hostdex: true, // for hiddenapi check
visibility: [
+ "//frameworks/base", // TODO(b/140299412) remove once all dependencies are fixed
"//frameworks/opt/net/wifi/service:__subpackages__",
] + test_access_hidden_api_whitelist,
apex_available: [