diff options
| author | 2020-01-17 21:16:31 +0000 | |
|---|---|---|
| committer | 2020-01-17 17:15:58 -0800 | |
| commit | 439175f1b93090c2f44292a508d9d37828fca085 (patch) | |
| tree | ea1db41aa3b61f0dd790cb89b83df0daee736cb3 | |
| parent | 32f3943b8d812319b936e7acb6cd95616ea0b4fc (diff) | |
Build framework-wifi against core_current & framework-system-stubs (Attempt 2)
At this point framework-wifi will not depend on
any @hide APIs.
Previous attempt broke git_master/apps target.
Bug: 140299412
Change-Id: Idf4c1d22f96c01ae9c117742dcfe83929ab545ae
Test: boots up and connects to Wifi
| -rw-r--r-- | Android.bp | 1 | ||||
| -rw-r--r-- | wifi/Android.bp | 21 |
2 files changed, 15 insertions, 7 deletions
diff --git a/Android.bp b/Android.bp index 5fcefa64a92f..0f30c1e5f223 100644 --- a/Android.bp +++ b/Android.bp @@ -472,7 +472,6 @@ java_library { "//frameworks/base/apex/permission/framework", "//frameworks/base/apex/statsd/service", "//frameworks/base/telephony", - "//frameworks/base/wifi", "//frameworks/opt/net/wifi/service", ], } diff --git a/wifi/Android.bp b/wifi/Android.bp index 5ef892d005ac..2f9979453f38 100644 --- a/wifi/Android.bp +++ b/wifi/Android.bp @@ -58,19 +58,20 @@ test_access_hidden_api_whitelist = [ // classes before they are renamed. java_library { name: "framework-wifi-pre-jarjar", - // TODO(b/140299412) should be core_current once we build against framework-system-stubs - sdk_version: "core_platform", + // TODO(b/146757305): sdk_version should be "module_lib_current" + sdk_version: "core_current", 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", @@ -80,13 +81,21 @@ 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/140299412) should be core_current once we build against framework-system-stubs - sdk_version: "core_platform", + // TODO(b/146757305): sdk_version should be "module_lib_current" + sdk_version: "core_current", static_libs: [ "framework-wifi-pre-jarjar", ], |