diff options
| author | Colin Cross <ccross@android.com> | 2020-05-07 16:56:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-07 16:56:24 +0000 |
| commit | f5850d8dd76ce3badecd190f6ef71d849d288c10 (patch) | |
| tree | 046fa97301791fc130e7eabc837982de4f337add | |
| parent | 85717bee79a1fdb2318fb52ab38ce72a023bc2db (diff) | |
| parent | 2a05f9a5dd91842d5e7db3d794ad8945eadcf979 (diff) | |
Merge "Set jni_uses_sdk_apis for NetworkStackTests" into rvc-dev am: 6421197f47 am: 2a05f9a5dd
Change-Id: Id1a935344ad2824a280303b2e6c31d8b6328c00b
| -rw-r--r-- | tests/integration/Android.bp | 1 | ||||
| -rw-r--r-- | tests/unit/Android.bp | 30 |
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", ], } |