Update target names for RE2 and ABSL.
Bug: 279548314
Test: presubmit
Change-Id: I2f19aa7be864db98ddf6861c5bf17476a8254460
diff --git a/Android.bp b/Android.bp
index 6fea6b4..ba5c920 100644
--- a/Android.bp
+++ b/Android.bp
@@ -126,15 +126,14 @@
"kythe/cxx/common/status.cc",
],
header_libs: [
- "libabsl_headers",
"rapidjson_headers",
],
static_libs: [
"kythe_cxx_glog",
- "libabsl_strings",
+ "libabsl",
"libgflags",
"libcrypto",
- "regex-re2",
+ "libregex_re2",
],
shared_libs: [
"libbase",
@@ -173,17 +172,8 @@
static_libs: [
"kythe_cxx_glog",
"kythe_cxx_common",
- "regex-re2",
- "libabsl_base",
- "libabsl_container",
- "libabsl_debugging",
- "libabsl_hash",
- "libabsl_numeric",
- "libabsl_profiling",
- "libabsl_status",
- "libabsl_strings",
- "libabsl_synchronization",
- "libabsl_time",
+ "libregex_re2",
+ "libabsl",
"libcrypto",
],
generated_headers: ["clang_builtin_headers_resources"],
@@ -213,18 +203,8 @@
static_libs: [
"kythe_cxx_glog",
"kythe_cxx_common",
- "regex-re2",
- "libabsl_base",
- "libabsl_container",
- "libabsl_debugging",
- "libabsl_flags",
- "libabsl_hash",
- "libabsl_numeric",
- "libabsl_profiling",
- "libabsl_status",
- "libabsl_strings",
- "libabsl_synchronization",
- "libabsl_time",
+ "libregex_re2",
+ "libabsl",
"libcrypto",
],
shared_libs: [
@@ -258,14 +238,7 @@
static_libs: [
"kythe_cxx_glog",
"kythe_cxx_common",
- "libabsl_base",
- "libabsl_container",
- "libabsl_debugging",
- "libabsl_hash",
- "libabsl_numeric",
- "libabsl_strings",
- "libabsl_synchronization",
- "libabsl_time",
+ "libabsl",
"libprotoc",
],
shared_libs: [
