summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author David Su <dysu@google.com> 2020-01-05 15:45:33 -0800
committer David Su <dysu@google.com> 2020-01-15 11:43:51 -0800
commiteb2572959a6d89c14c9ba1de23a9ef561eb87e15 (patch)
tree3a62c5c4676b2eae2ad3bf444f387d67e81514f3
parentd084a449ccfdc9b1eb4a328ffaa9bc7dbf862567 (diff)
framework.jar - include framework-wifi-stubs instead of framework-wifi
Stop exporting @hide APIs from framework-wifi to framework.jar by including framework-wifi-stubs instead. Bug: 140299412 Test: boots up and connects to Wifi Change-Id: If790ea3ac4e6587b28063eac59295cb875a8ce35
-rw-r--r--Android.bp6
-rw-r--r--wifi/Android.bp1
2 files changed, 3 insertions, 4 deletions
diff --git a/Android.bp b/Android.bp
index a7ac094e1b56..d542502c918b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -491,8 +491,7 @@ java_library {
"framework-sdkextensions-stubs-systemapi",
// TODO(b/146167933): Use framework-statsd-stubs instead.
"framework-statsd",
- // TODO(b/140299412): should be framework-wifi-stubs
- "framework-wifi",
+ "framework-wifi-stubs",
"ike-stubs",
// TODO(b/147200698): should be the stub of framework-tethering
"framework-tethering",
@@ -528,7 +527,8 @@ java_library {
"compat-changeid-annotation-processor",
],
static_libs: [
- "exoplayer2-core"
+ "exoplayer2-core",
+ "android.hardware.wifi-V1.0-java-constants",
]
}
diff --git a/wifi/Android.bp b/wifi/Android.bp
index 70c9befce66a..791da3051ca2 100644
--- a/wifi/Android.bp
+++ b/wifi/Android.bp
@@ -97,7 +97,6 @@ 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: [