Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61ca802c authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Remove dependency on framework-connectivity-test-defaults" into main... 

Merge "Remove dependency on framework-connectivity-test-defaults" into main am: 1e566026 am: 3ec8fb8c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2999776



Change-Id: Ia721460150fb4fb47978aad21997c475d663162d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 57e52590 3ec8fb8c

services/tests/VpnTests/Android.bp

+8 −2
Original line number Original line Diff line number Diff line
@@ -17,8 +17,7 @@ android_test { 
        "java/**/*.java",

        "java/**/*.java",

        "java/**/*.kt",

        "java/**/*.kt",

    ],

    ],



    sdk_version: "core_platform", // tests can use @CorePlatformApi's

    defaults: ["framework-connectivity-test-defaults"],

    test_suites: ["device-tests"],

    test_suites: ["device-tests"],

    static_libs: [

    static_libs: [

        "androidx.test.rules",

        "androidx.test.rules",
@@ -32,6 +31,13 @@ android_test { 
        "service-connectivity-tiramisu-pre-jarjar",

        "service-connectivity-tiramisu-pre-jarjar",

    ],

    ],

    libs: [

    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.runner",

        "android.test.base",

        "android.test.base",

        "android.test.mock",

        "android.test.mock",