diff options
| author | David Su <dysu@google.com> | 2020-03-16 15:59:56 -0700 |
|---|---|---|
| committer | David Su <dysu@google.com> | 2020-03-16 15:59:56 -0700 |
| commit | 36fc0d20f01549abe1148b46e484709874f6ecff (patch) | |
| tree | 488705f4cfbaaf983440379ec2208d07866d6b62 | |
| parent | 5189259cfb40237570b3db131712c22fe7860b75 (diff) | |
Build wifi-service against system_server_current
wifi-service now exclusively builds against
formal APIs.
Bug: 140299412
Test: boots up and connects to wifi
Change-Id: Ie521227a53165073e036b83afdf5723bca22c00d
| -rw-r--r-- | service/Android.bp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/service/Android.bp b/service/Android.bp index 43b4b351b..22cb3a543 100644 --- a/service/Android.bp +++ b/service/Android.bp @@ -52,20 +52,16 @@ java_library { // java_api_finder must accompany `srcs` plugins: ["java_api_finder"], - // TODO(b/140299412) should be "system_server_current" since Wifi module is not allowed to use - // @CorePlatformApi's - sdk_version: "core_platform", + sdk_version: "system_server_current", libs: [ "error_prone_annotations", "jsr305", "framework-annotations-lib", - "services-stubs", // TODO(b/140299412): remove // load the resources from the resources APK. "wifi-service-resources", // need pre-jarjar symbols so that wifi-service can reference the original class names at // compile time "framework-wifi-pre-jarjar", - "android_module_lib_stubs_current", // TODO(b/140299412): remove "framework-statsd-stubs-module_libs_api", "framework-telephony-stubs", "unsupportedappusage", @@ -111,14 +107,9 @@ java_library { // need to include `libs` so that Soong doesn't complain about missing classes after jarjaring libs: [ "framework-wifi", - "android_module_lib_stubs_current", - "services-stubs", - "framework-telephony-stubs", ], - // TODO(b/140299412) should be "core_current" since Wifi module is not allowed to use - // @CorePlatformApi's - sdk_version: "core_platform", + sdk_version: "system_server_current", jarjar_rules: ":wifi-jarjar-rules", optimize: { |