Manually merge aosp/2760185

Internal automerger won't work before the project is added to the
main manifest.

Bug: 279548314
Test: N/A, project not yet in main manifest.
Change-Id: I1de6705840637ad59b7ac1f9879cb3bd29631eca

1 files changed, 5 insertions, 2 deletions

diff --git a/Android.bp b/Android.bp
index 7a62d81..8e56985 100644
--- a/Android.bp
+++ b/Android.bp
@@ -52,9 +52,12 @@ cc_library_static {
     ],
 }
 
-cc_test {
+// This test uses a minimal fork of GTest that is incompatible with Android
+// testing infrastructure, so it is currently a cc_binary rather than a cc_test.
+// It can be run directly and should produce a pass/fail result:
+// out/host/linux-x86/bin/regex_re2_test
+cc_binary_host {
     name: "regex_re2_test",
-    host_supported: true,
     srcs: [
         "re2/testing/backtrack.cc",
         "re2/testing/charclass_test.cc",