commit 28b0b36f3e8d245d6a1a19ee6c401256f38dda20
author Colin Cross <ccross@android.com> Wed May 06 17:53:18 2020 -0700
committer Colin Cross <ccross@android.com> Thu May 07 18:09:29 2020 +0000
tree 43974263515487980f292b1419f72502b799774d
parent 5adebbffbeca16748f08c3093c284b417ff5cee4

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

tests/integration/Android.bp

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"],
 }