Update Android.bp file for RE2.

Rename the module to match the convention for C++ libraries.
Hook up unit tests to simplify validating upgrades.

Bug: 279548314
Test: presubmit
Change-Id: I208d63a2243f91552ea8277bc33168ab65969f3c

1 files changed, 59 insertions, 2 deletions

diff --git a/Android.bp b/Android.bp
index 56551e4..7a62d81 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,5 +1,22 @@
-cc_library_host_static {
-    name: "regex-re2",
+package {
+    default_applicable_licenses: ["external_regex_re2_license"],
+}
+
+license {
+    name: "external_regex_re2_license",
+    visibility: [":__subpackages__"],
+    license_kinds: ["SPDX-license-identifier-BSD-3-Clause"],
+    license_text: ["LICENSE"],
+}
+
+cc_library_static {
+    name: "libregex_re2",
+    host_supported: true,
+    vendor_available: true,
+    stl: "libc++",
+    apex_available: [
+        "//apex_available:platform",
+    ],
     srcs: [
         "util/rune.cc",
         "util/strutil.cc",
@@ -29,4 +46,44 @@ cc_library_host_static {
         "-Wno-missing-field-initializers",
     ],
     export_include_dirs: ["."],
+    visibility: [
+        "//external/grpc-grpc:__subpackages__",
+        "//external/kythe:__subpackages__",
+    ],
+}
+
+cc_test {
+    name: "regex_re2_test",
+    host_supported: true,
+    srcs: [
+        "re2/testing/backtrack.cc",
+        "re2/testing/charclass_test.cc",
+        "re2/testing/compile_test.cc",
+        "re2/testing/dump.cc",
+        "re2/testing/filtered_re2_test.cc",
+        "re2/testing/mimics_pcre_test.cc",
+        "re2/testing/null_walker.cc",
+        "re2/testing/parse_test.cc",
+        "re2/testing/possible_match_test.cc",
+        "re2/testing/re2_arg_test.cc",
+        "re2/testing/re2_test.cc",
+        "re2/testing/regexp_generator.cc",
+        "re2/testing/regexp_test.cc",
+        "re2/testing/required_prefix_test.cc",
+        "re2/testing/search_test.cc",
+        "re2/testing/set_test.cc",
+        "re2/testing/simplify_test.cc",
+        "re2/testing/string_generator.cc",
+        "re2/testing/string_generator_test.cc",
+        "re2/testing/tester.cc",
+        "util/pcre.cc",
+        "util/test.cc",
+    ],
+    cflags: [
+        "-Wno-unused-parameter",
+        "-Wno-missing-field-initializers",
+    ],
+    static_libs: [
+        "libregex_re2",
+    ],
 }