commit b3cad554eb11eb062b66438146207d7e717f5e0a
author Chidera Olibie <colibie@google.com> Mon Feb 13 13:02:29 2023 +0000
committer Chidera Olibie <colibie@google.com> Mon Feb 13 14:10:23 2023 +0000
tree 507fcfd0c500153c03c464a5d9be7859c22010da
parent d93c86e9c0d0333ef55c8c8bb97bd27879ef4e7c

Remove compile_multilib from non-coverage test target

This was added to targets being used for coverage collection

Test: atest CtsNetHttpTestCases, NetHttpTests
Change-Id: I5e8dad82d57014cffbf7ab58b54328ea04316f70

Cronet/tests/common/Android.bp

diff --git a/Cronet/tests/common/Android.bp b/Cronet/tests/common/Android.bp
index 1ed0881..f8bdb08 100644
--- a/Cronet/tests/common/Android.bp
+++ b/Cronet/tests/common/Android.bp
@@ -35,5 +35,5 @@
         "NetHttpTestsLibPreJarJar",
     ],
     jarjar_rules: ":framework-tethering-jarjar-rules",
-    compile_multilib: "both",
+    compile_multilib: "both", // Include both the 32 and 64 bit versions
 }

Cronet/tests/cts/Android.bp

diff --git a/Cronet/tests/cts/Android.bp b/Cronet/tests/cts/Android.bp
index 9a5ed89..21dc210 100644
--- a/Cronet/tests/cts/Android.bp
+++ b/Cronet/tests/cts/Android.bp
@@ -73,7 +73,6 @@
         "CronetTestJavaDefaults",
     ],
     sdk_version: "test_current",
-    compile_multilib: "both", // Include both the 32 and 64 bit versions
     static_libs: ["CtsNetHttpTestsLib"],
     // Tag this as a cts test artifact
     test_suites: [

Cronet/tests/mts/Android.bp

diff --git a/Cronet/tests/mts/Android.bp b/Cronet/tests/mts/Android.bp
index cfafc5b..1cabd63 100644
--- a/Cronet/tests/mts/Android.bp
+++ b/Cronet/tests/mts/Android.bp
@@ -37,7 +37,6 @@
         "CronetTestJavaDefaults",
         "mts-target-sdk-version-current",
      ],
-     compile_multilib: "both",
      sdk_version: "test_current",
      static_libs: ["NetHttpTestsLibPreJarJar"],
      jarjar_rules: ":framework-tethering-jarjar-rules",