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
diff --git a/tests/integration/Android.bp b/tests/integration/Android.bp
index a9eabc8..e924d3a 100644
--- a/tests/integration/Android.bp
+++ b/tests/integration/Android.bp
@@ -24,6 +24,7 @@
// For NetworkStackUtils included in NetworkStackBase
"libnetworkstackutilsjni",
],
+ jni_uses_sdk_apis: true,
visibility: ["//visibility:private"],
}
diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp
index 98351cd..670b8e6 100644
--- a/tests/unit/Android.bp
+++ b/tests/unit/Android.bp
@@ -39,6 +39,7 @@
"libstaticjvmtiagent",
"libnetworkstackutilsjni",
],
+ jni_uses_sdk_apis: true,
jarjar_rules: ":NetworkStackJarJarRules",
}
@@ -80,36 +81,7 @@
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",
],
}