From 27953f11fba5f2ac4cec5c66de49676caa1ade8c Mon Sep 17 00:00:00 2001 From: David Su Date: Wed, 10 Jun 2020 12:39:07 -0700 Subject: [PATCH] framework-wifi & OsuLogin: set min & target SDK version to 30 Bug: 158681189 Test: device boots up and connects to wifi Test: connect to OSU network Change-Id: I751bd3b7a89a7b3dab6a68e1b030651fbb801481 --- packages/OsuLogin/Android.bp | 1 + wifi/Android.bp | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/packages/OsuLogin/Android.bp b/packages/OsuLogin/Android.bp index d7e36b164811a..445c81b892731 100644 --- a/packages/OsuLogin/Android.bp +++ b/packages/OsuLogin/Android.bp @@ -1,5 +1,6 @@ android_app { name: "OsuLogin", + defaults: ["wifi-module-sdk-version-defaults"], static_libs: ["androidx.legacy_legacy-support-v4"], resource_dirs: ["res"], srcs: ["src/**/*.java"], diff --git a/wifi/Android.bp b/wifi/Android.bp index 9c5b7b66f2a3c..941ff61b3ba59 100644 --- a/wifi/Android.bp +++ b/wifi/Android.bp @@ -12,6 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. +java_defaults { + name: "wifi-module-sdk-version-defaults", + min_sdk_version: "30", + target_sdk_version: "30", +} + filegroup { name: "framework-wifi-updatable-exported-aidl-sources", srcs: ["aidl-export/**/*.aidl"], @@ -73,6 +79,7 @@ test_access_hidden_api_whitelist = [ // classes before they are renamed. java_library { name: "framework-wifi-pre-jarjar", + defaults: ["wifi-module-sdk-version-defaults"], sdk_version: "module_current", static_libs: [ "framework-wifi-util-lib", @@ -98,7 +105,10 @@ java_library { // post-jarjar version of framework-wifi java_sdk_library { name: "framework-wifi", - defaults: ["framework-module-defaults"], + defaults: [ + "framework-module-defaults", + "wifi-module-sdk-version-defaults", + ], static_libs: [ "framework-wifi-util-lib", "android.hardware.wifi-V1.0-java-constants",