From c10258e746db26b383b643e14e2181cb7a5d08f5 Mon Sep 17 00:00:00 2001 From: Chiachang Wang Date: Tue, 12 Mar 2024 07:02:23 +0000 Subject: Remove dependency on framework-connectivity-test-defaults Replace the usage to include necessary lib only to address comment from aosp/2981832. Test: atest FrameworksVpnTests Change-Id: Id130c6739a683fc0c9e01e4e42d9215b660dba95 --- services/tests/VpnTests/Android.bp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/services/tests/VpnTests/Android.bp b/services/tests/VpnTests/Android.bp index 64a9a3b4f119..a5011a8d8b00 100644 --- a/services/tests/VpnTests/Android.bp +++ b/services/tests/VpnTests/Android.bp @@ -17,8 +17,7 @@ android_test { "java/**/*.java", "java/**/*.kt", ], - - defaults: ["framework-connectivity-test-defaults"], + sdk_version: "core_platform", // tests can use @CorePlatformApi's test_suites: ["device-tests"], static_libs: [ "androidx.test.rules", @@ -32,6 +31,13 @@ android_test { "service-connectivity-tiramisu-pre-jarjar", ], libs: [ + // order matters: classes in framework-connectivity are resolved before framework, + // meaning @hide APIs in framework-connectivity are resolved before @SystemApi + // stubs in framework + "framework-connectivity.impl", + "framework-connectivity-t.impl", + "framework", + "framework-res", "android.test.runner", "android.test.base", "android.test.mock", -- cgit v1.2.3-59-g8ed1b