summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKrzysztof Kosiński <krzysio@google.com>2023-09-05 21:19:17 +0000
committerKrzysztof Kosiński <krzysio@google.com>2023-09-05 23:51:52 +0000
commit722ba5ca86bcf17a1ff135335ca61ddc64a6350e (patch)
tree54a09731d786c19bcede14d71661d782c4b459cf
parent80c14b0393968462aa668529f09b4f4e9307bb87 (diff)
downloadkythe-722ba5ca86bcf17a1ff135335ca61ddc64a6350e.tar.gz
Update target names for RE2 and ABSL.
Bug: 279548314 Test: presubmit Change-Id: I2f19aa7be864db98ddf6861c5bf17476a8254460
-rw-r--r--Android.bp41
1 files changed, 7 insertions, 34 deletions
diff --git a/Android.bp b/Android.bp
index 6fea6b4e9..ba5c9207c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -126,15 +126,14 @@ cc_library_host_static {
"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 @@ cc_binary_host {
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 @@ cc_binary_host {
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 @@ cc_binary_host {
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: [