diff options
| -rw-r--r-- | wifi/Android.bp | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/wifi/Android.bp b/wifi/Android.bp index 76ccc68908d1..4c9ee854536e 100644 --- a/wifi/Android.bp +++ b/wifi/Android.bp @@ -58,20 +58,19 @@ test_access_hidden_api_whitelist = [ // classes before they are renamed. java_library { name: "framework-wifi-pre-jarjar", - // TODO(b/146757305): sdk_version should be "module_lib_current" - sdk_version: "core_current", + // TODO(b/140299412) should be core_current once we build against framework-system-stubs + sdk_version: "core_platform", static_libs: [ "framework-wifi-util-lib", "android.hardware.wifi-V1.0-java-constants", ], libs: [ + // TODO(b/140299412) should be framework-system-stubs once we fix all @hide dependencies + "framework-minus-apex", "framework-annotations-lib", "unsupportedappusage", // for android.compat.annotation.UnsupportedAppUsage "unsupportedappusage-annotation", // for dalvik.annotation.compat.UnsupportedAppUsage "framework-telephony-stubs", - // TODO(b/146757305): should be unnecessary once - // sdk_version="module_lib_current" - "android_system_stubs_current", ], srcs: [ ":framework-wifi-updatable-sources", @@ -81,21 +80,13 @@ java_library { "//frameworks/opt/net/wifi/service", "//frameworks/opt/net/wifi/tests/wifitests", ], - - // TODO(b/146757305): should be unnecessary once - // sdk_version="module_lib_current" - aidl: { - include_dirs: [ - "frameworks/base/core/java", - ], - }, } // post-jarjar version of framework-wifi java_library { name: "framework-wifi", - // TODO(b/146757305): sdk_version should be "module_lib_current" - sdk_version: "core_current", + // TODO(b/140299412) should be core_current once we build against framework-system-stubs + sdk_version: "core_platform", static_libs: [ "framework-wifi-pre-jarjar", ], |