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

Commit dc09e6e6 authored by paulhu's avatar paulhu Committed by Paul Hu
Browse files

Correct FrameworksNetTests-jni-defaults lib 

FrameworksNetTests-jni-defaults lib should only contain jni
dependencies. Remove static_libs/libs from it and update
FrameworksNetTests/FrameworksNetSmokeTests libs as well.

Bug: NA
Test: atest FrameworksNetSmokeTests FrameworksNetTests
Change-Id: I705e949e4c00035c9734b6a240529d1c2216eb6b
parent d1379a4a

tests/net/Android.bp

+20 −20
Original line number Original line Diff line number Diff line
@@ -3,22 +3,6 @@ 
//########################################################################

//########################################################################

java_defaults {

java_defaults {

    name: "FrameworksNetTests-jni-defaults",

    name: "FrameworksNetTests-jni-defaults",

    static_libs: [

        "FrameworksNetCommonTests",

        "frameworks-base-testutils",

        "framework-protos",

        "androidx.test.rules",

        "mockito-target-minus-junit4",

        "net-tests-utils",

        "platform-test-annotations",

        "services.core",

        "services.net",

    ],

    libs: [

        "android.test.runner",

        "android.test.base",

        "android.test.mock",

    ],

    jni_libs: [

    jni_libs: [

        "ld-android",

        "ld-android",

        "libartbase",

        "libartbase",
@@ -44,20 +28,20 @@ java_defaults { 
        "libnativehelper",

        "libnativehelper",

        "libnetdbpf",

        "libnetdbpf",

        "libnetdutils",

        "libnetdutils",

        "libnetworkstatsfactorytestjni",

        "libpackagelistparser",

        "libpackagelistparser",

        "libpcre2",

        "libpcre2",

        "libprocessgroup",

        "libprocessgroup",

        "libselinux",

        "libselinux",

        "libui",

        "libutils",

        "libvndksupport",

        "libtinyxml2",

        "libtinyxml2",

        "libui",

        "libunwindstack",

        "libunwindstack",

        "libutils",

        "libutilscallstack",

        "libutilscallstack",

        "libvndksupport",

        "libziparchive",

        "libziparchive",

        "libz",

        "libz",

        "netd_aidl_interface-V2-cpp",

        "netd_aidl_interface-V2-cpp",

        "libnetworkstatsfactorytestjni",

    ],

    ],

}

}
@@ -68,4 +52,20 @@ android_test { 
    platform_apis: true,

    platform_apis: true,

    test_suites: ["device-tests"],

    test_suites: ["device-tests"],

    certificate: "platform",

    certificate: "platform",

    static_libs: [

        "androidx.test.rules",

        "FrameworksNetCommonTests",

        "frameworks-base-testutils",

        "framework-protos",

        "mockito-target-minus-junit4",

        "net-tests-utils",

        "platform-test-annotations",

        "services.core",

        "services.net",

    ],

    libs: [

        "android.test.runner",

        "android.test.base",

        "android.test.mock",

    ],

}
 
}

tests/net/smoketest/Android.bp

+6 −1
Original line number Original line Diff line number Diff line
@@ -14,4 +14,9 @@ android_test { 
    defaults: ["FrameworksNetTests-jni-defaults"],

    defaults: ["FrameworksNetTests-jni-defaults"],

    srcs: ["java/SmokeTest.java"],

    srcs: ["java/SmokeTest.java"],

    test_suites: ["device-tests"],

    test_suites: ["device-tests"],

    static_libs: [

        "androidx.test.rules",

        "mockito-target-minus-junit4",

        "services.core",

    ],

}
 
}
 
 No newline at end of file