summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--service/Android.bp27
1 files changed, 16 insertions, 11 deletions
diff --git a/service/Android.bp b/service/Android.bp
index e52429970..25ec4dc64 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -87,12 +87,20 @@ java_library {
defaults: ["wifi-service-common"],
srcs: [ ":wifi-service-srcs" ],
+ // TODO(b/140299412) should be "core_current" since Wifi module is not allowed to use
+ // @CorePlatformApi's
+ sdk_version: "core_platform",
libs: [
"error_prone_annotations",
"jsr305",
"services",
- // load the resources from the resources APK.
- "wifi-service-resources"
+ // load the resources from the resources APK.
+ "wifi-service-resources",
+ "framework-wifi",
+
+ // TODO(b/135994092): Replace with framework-system-stubs once all @hide dependencies are
+ // resolved.
+ "framework-minus-apex",
],
static_libs: [
@@ -112,24 +120,24 @@ java_library {
"androidx.annotation_annotation",
"bouncycastle-unbundled",
"ksoap2",
- // Note: libprotobuf-java-lite uses a few core platform APIs which
- // does show up as @hide API usage. But, this can be safely ignored
- // since the library uses reflection to ensure that the OS does provide
- // the necessary core platform APIs.
+ // Note: libprotobuf-java-lite uses a few core platform APIs which
+ // does show up as @hide API usage. But, this can be safely ignored
+ // since the library uses reflection to ensure that the OS does provide
+ // the necessary core platform APIs.
"libprotobuf-java-lite",
"libnanohttpd",
"netd_aidl_interface-V2-java",
"services.net",
"wifi_proto_scorecard",
"wifi_proto_metrics",
- "PlatformProperties"
+ "PlatformProperties",
],
required: [
"cacerts_wfa",
"libwifi-jni",
"services",
- "wifi-service-resources",
+ "wifi-service-resources",
],
jarjar_rules: ":wifi-service-jarjar-rules",
@@ -143,9 +151,6 @@ java_library {
app_image: false,
},
- // TODO: Remove this once all @hide dependencies are resolved.
- platform_apis: true,
-
init_rc: ["wifi.rc"],
}