Merge "Set jni_uses_sdk_apis for NetworkStackTests" into rvc-dev

2 files changed, 2 insertions, 29 deletions

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 @@ java_defaults {
         // 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 @@ 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",
     ],
 }