From 918b9085394666396fe61991343fd3476eabe228 Mon Sep 17 00:00:00 2001 From: David Su Date: Wed, 25 Nov 2020 12:06:15 -0800 Subject: [PATCH 1/2] Allow FrameworksWifiApiTests to be installed on R & S devices FrameworksWifiApiTests cannot run on R devices because it compiles against the latest unstable SDK. To fix this, set target_sdk_version to "30". Bug: 173336987 Test: 1. Flash R build 2. Install S Wifi module 3. Run `atest FrameworksWifiTests` 4. Verify test APK installs on the device (Note: not all tests are passing.) Change-Id: I747d8a0afc17dedcde1959cf062eef6e6e8a521f --- wifi/tests/Android.bp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/wifi/tests/Android.bp b/wifi/tests/Android.bp index 7272e146f4f84..7eba0a73be31f 100644 --- a/wifi/tests/Android.bp +++ b/wifi/tests/Android.bp @@ -20,6 +20,9 @@ android_test { defaults: ["framework-wifi-test-defaults"], + min_sdk_version: "30", + target_sdk_version: "30", + srcs: ["**/*.java"], jacoco: { From 0bd053f4113de73c2ee1968f9637dc2e634c103e Mon Sep 17 00:00:00 2001 From: David Su Date: Wed, 25 Nov 2020 10:55:11 -0800 Subject: [PATCH 2/2] FrameworksWifiApiTests: build against core_current FrameworksWifiApiTests no longer uses as @CorePlatformApi's. Thus, build it against core_current instead of core_platform. Bug: 173336987 Test: atest FrameworksWifiApiTests Change-Id: I684b90697b96cafd5de76ec3db3cce21d6917fad --- wifi/Android.bp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/Android.bp b/wifi/Android.bp index 52e3840c126e6..7a9ca6012be5d 100644 --- a/wifi/Android.bp +++ b/wifi/Android.bp @@ -147,7 +147,7 @@ java_sdk_library { // defaults for tests that need to build against framework-wifi's @hide APIs java_defaults { name: "framework-wifi-test-defaults", - sdk_version: "core_platform", // tests can use @CorePlatformApi's + sdk_version: "core_current", libs: [ // order matters: classes in framework-wifi are resolved before framework, meaning // @hide APIs in framework-wifi are resolved before @SystemApi stubs in framework