commit d9b892c1477383ad6cbad74b1b1598bc461dd11f
author Treehugger Robot <treehugger-gerrit@google.com> Fri Apr 17 05:04:53 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 17 05:04:53 2020 +0000
tree 31a3fa7fbfa6160f71d469b7f717c2235cf258a2
parent 3936e08f650fad6d7a3c3a57c5ec2ec562992a51
parent 85f0fca1f071250fcb8f286e6bca30d0fcd8a965

Merge "Add more tests to CtsTetheringTest"

tests/cts/tethering/Android.bp

diff --git a/tests/cts/tethering/Android.bp b/tests/cts/tethering/Android.bp
index 0f98125..63de301 100644
--- a/tests/cts/tethering/Android.bp
+++ b/tests/cts/tethering/Android.bp
@@ -25,12 +25,19 @@
     ],
 
     static_libs: [
+        "TetheringIntegrationTestsLib",
         "compatibility-device-util-axt",
         "ctstestrunner-axt",
         "junit",
         "junit-params",
     ],
 
+    jni_libs: [
+        // For mockito extended
+        "libdexmakerjvmtiagent",
+        "libstaticjvmtiagent",
+    ],
+
     // Change to system current when TetheringManager move to bootclass path.
     platform_apis: true,
 
@@ -41,4 +48,6 @@
         "mts",
     ],
 
+    // Include both the 32 and 64 bit versions
+    compile_multilib: "both",
 }