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

Commit 28b0b36f authored by Colin Cross's avatar Colin Cross
Browse files

Set jni_uses_sdk_apis for NetworkStackTests 

NetworkStackTests doesn't set sdk_version but needs portable versions
of its JNI libraries.  Set jni_uses_sdk_apis, and remove the extra
JNI libraries that don't have SDK variants.

(clean cherry-pick from internal branch)
Bug: 154665579
Test: atest NetworkStackCoverageMtsConfigTests on a Q device
Merged-In: Ieff8acec71d206104033a04c049840fd94adfce9
Change-Id: Ieff8acec71d206104033a04c049840fd94adfce9
parent 5adebbff

tests/integration/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ java_defaults { 
        // For NetworkStackUtils included in NetworkStackBase

        "libnetworkstackutilsjni",

    ],

    jni_uses_sdk_apis: true,

    visibility: ["//visibility:private"],

}

tests/unit/Android.bp

+1 −29
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ java_defaults { 
        "libstaticjvmtiagent",

        "libnetworkstackutilsjni",

    ],

    jni_uses_sdk_apis: true,

    jarjar_rules: ":NetworkStackJarJarRules",

}
@@ -80,36 +81,7 @@ android_test { 
java_defaults {

    name: "libnetworkstackutilsjni_deps",

    jni_libs: [

        "libbacktrace",

        "libbase",

        "libbinder",

        "libc++",

        "libcgrouprc",

        "libcrypto",

        "libcutils",

        "ld-android",

        "libdl_android",

        "libhidl-gen-utils",

        "libhidlbase",

        "libjsoncpp",

        "liblog",

        "liblzma",

        "libnativehelper",

        "libnativehelper_compat_libc++",

        "libnetworkstacktestsjni",

        "libpackagelistparser",

        "libpcre2",

        "libprocessgroup",

        "libselinux",

        "libui",

        "libutils",

        "libvintf",

        "libvndksupport",

        "libtinyxml2",

        "libunwindstack",

        "libutilscallstack",

        "libziparchive",

        "libz",

        "netd_aidl_interface-cpp",

    ],

}