framework.jar - include framework-wifi-stubs instead of framework-wifi (Attempt 2)
Stop exporting @hide APIs from framework-wifi
to framework.jar by including framework-wifi-stubs
instead. At this point no code is allowed to call @hide APIs
defined in framework-wifi unless they have an explicit
exemption.
Attempt 1 broke the build, trying again.
Bug: 140299412
Change-Id: I3eecb0a5f6b1c0be85d684d190465d591994d99f
Test: boots up and connects to Wifi
diff --git a/Android.bp b/Android.bp
index 5fcefa6..f16f2ea 100644
--- a/Android.bp
+++ b/Android.bp
@@ -499,8 +499,7 @@
"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",
@@ -539,7 +538,8 @@
"compat-changeid-annotation-processor",
],
static_libs: [
- "exoplayer2-core"
+ "exoplayer2-core",
+ "android.hardware.wifi-V1.0-java-constants",
]
}
@@ -1204,7 +1204,7 @@
"core/java/com/android/internal/util/Protocol.java",
"core/java/com/android/internal/util/Preconditions.java",
"telephony/java/android/telephony/Annotation.java",
- ":net-utils-framework-wifi-common-srcs",
+ ":net-utils-framework-wifi-common-srcs",
],
libs: [
"framework-annotations-lib",
@@ -1231,6 +1231,7 @@
"core/java/com/android/internal/util/StateMachine.java",
"core/java/com/android/internal/util/WakeupMessage.java",
],
+ visibility: ["//frameworks/opt/net/wifi/service"],
}
// TODO(b/145644363): move this to under StubLibraries.bp or ApiDocs.bp