From 9e15f78cf839bef02c83857937e5433c1a6fb4cd Mon Sep 17 00:00:00 2001
From: Esun Kim <veblush@google.com>
Date: Wed, 15 Jan 2020 13:39:51 -0800
Subject: [PATCH] Update absl to the lastest

---
 Makefile                                    |  2 +
 bazel/grpc_deps.bzl                         |  6 +--
 config.m4                                   |  1 +
 config.w32                                  |  1 +
 grpc.gemspec                                |  2 +
 package.xml                                 |  2 +
 src/abseil-cpp/preprocessed_builds.yaml     | 48 +++++++++++++++------
 src/python/grpcio/grpc_core_dependencies.py |  1 +
 third_party/abseil-cpp                      |  2 +-
 tools/run_tests/sanity/check_submodules.sh  |  2 +-
 10 files changed, 48 insertions(+), 19 deletions(-)

diff --git a/Makefile b/Makefile
index 2ed28f372d7..d06392bbbe5 100644
--- a/Makefile
+++ b/Makefile
@@ -8993,6 +8993,7 @@ LIBGRPC_ABSEIL_SRC = \
     third_party/abseil-cpp/absl/strings/escaping.cc \
     third_party/abseil-cpp/absl/strings/internal/charconv_bigint.cc \
     third_party/abseil-cpp/absl/strings/internal/charconv_parse.cc \
+    third_party/abseil-cpp/absl/strings/internal/escaping.cc \
     third_party/abseil-cpp/absl/strings/internal/memutil.cc \
     third_party/abseil-cpp/absl/strings/internal/ostringstream.cc \
     third_party/abseil-cpp/absl/strings/internal/utf8.cc \
@@ -23398,6 +23399,7 @@ third_party/abseil-cpp/absl/strings/charconv.cc: $(OPENSSL_DEP)
 third_party/abseil-cpp/absl/strings/escaping.cc: $(OPENSSL_DEP)
 third_party/abseil-cpp/absl/strings/internal/charconv_bigint.cc: $(OPENSSL_DEP)
 third_party/abseil-cpp/absl/strings/internal/charconv_parse.cc: $(OPENSSL_DEP)
+third_party/abseil-cpp/absl/strings/internal/escaping.cc: $(OPENSSL_DEP)
 third_party/abseil-cpp/absl/strings/internal/memutil.cc: $(OPENSSL_DEP)
 third_party/abseil-cpp/absl/strings/internal/ostringstream.cc: $(OPENSSL_DEP)
 third_party/abseil-cpp/absl/strings/internal/utf8.cc: $(OPENSSL_DEP)
diff --git a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl
index 68c01837ffc..634bd6f8838 100644
--- a/bazel/grpc_deps.bzl
+++ b/bazel/grpc_deps.bzl
@@ -195,9 +195,9 @@ def grpc_deps():
     if "com_google_absl" not in native.existing_rules():
         http_archive(
             name = "com_google_absl",
-            sha256 = "6e477042edb279a7e3436f5d571b918389daea4b01d0d1e37ace50157d132b36",
-            strip_prefix = "abseil-cpp-bf86cfe165ef7d70dfe68f0b8fc0c018bc79a577",
-            url = "https://github.com/abseil/abseil-cpp/archive/bf86cfe165ef7d70dfe68f0b8fc0c018bc79a577.tar.gz",
+            sha256 = "939e50c2fbcbd6f1124023350ef9bd5310d413227faf0e11de2a366dcc4e1e48",
+            strip_prefix = "abseil-cpp-a2e6adecc294dc4cd98cc285a9134ce58e0f2ad0",
+            url = "https://github.com/abseil/abseil-cpp/archive/a2e6adecc294dc4cd98cc285a9134ce58e0f2ad0.tar.gz",
         )
 
     if "bazel_toolchains" not in native.existing_rules():
diff --git a/config.m4 b/config.m4
index 0cefe86b429..dea19dbacc2 100644
--- a/config.m4
+++ b/config.m4
@@ -477,6 +477,7 @@ if test "$PHP_GRPC" != "no"; then
     third_party/abseil-cpp/absl/strings/escaping.cc \
     third_party/abseil-cpp/absl/strings/internal/charconv_bigint.cc \
     third_party/abseil-cpp/absl/strings/internal/charconv_parse.cc \
+    third_party/abseil-cpp/absl/strings/internal/escaping.cc \
     third_party/abseil-cpp/absl/strings/internal/memutil.cc \
     third_party/abseil-cpp/absl/strings/internal/ostringstream.cc \
     third_party/abseil-cpp/absl/strings/internal/utf8.cc \
diff --git a/config.w32 b/config.w32
index a199505ef92..2cf92ef68d8 100644
--- a/config.w32
+++ b/config.w32
@@ -446,6 +446,7 @@ if (PHP_GRPC != "no") {
     "third_party\\abseil-cpp\\absl\\strings\\escaping.cc " +
     "third_party\\abseil-cpp\\absl\\strings\\internal\\charconv_bigint.cc " +
     "third_party\\abseil-cpp\\absl\\strings\\internal\\charconv_parse.cc " +
+    "third_party\\abseil-cpp\\absl\\strings\\internal\\escaping.cc " +
     "third_party\\abseil-cpp\\absl\\strings\\internal\\memutil.cc " +
     "third_party\\abseil-cpp\\absl\\strings\\internal\\ostringstream.cc " +
     "third_party\\abseil-cpp\\absl\\strings\\internal\\utf8.cc " +
diff --git a/grpc.gemspec b/grpc.gemspec
index 5d71db1ff89..07b2d659768 100644
--- a/grpc.gemspec
+++ b/grpc.gemspec
@@ -936,6 +936,8 @@ Gem::Specification.new do |s|
   s.files += %w( third_party/abseil-cpp/absl/strings/internal/charconv_bigint.h )
   s.files += %w( third_party/abseil-cpp/absl/strings/internal/charconv_parse.cc )
   s.files += %w( third_party/abseil-cpp/absl/strings/internal/charconv_parse.h )
+  s.files += %w( third_party/abseil-cpp/absl/strings/internal/escaping.cc )
+  s.files += %w( third_party/abseil-cpp/absl/strings/internal/escaping.h )
   s.files += %w( third_party/abseil-cpp/absl/strings/internal/memutil.cc )
   s.files += %w( third_party/abseil-cpp/absl/strings/internal/memutil.h )
   s.files += %w( third_party/abseil-cpp/absl/strings/internal/ostringstream.cc )
diff --git a/package.xml b/package.xml
index 895827e0908..363a3c889a2 100644
--- a/package.xml
+++ b/package.xml
@@ -941,6 +941,8 @@
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/internal/charconv_bigint.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/internal/charconv_parse.cc" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/internal/charconv_parse.h" role="src" />
+    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/internal/escaping.cc" role="src" />
+    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/internal/escaping.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/internal/memutil.cc" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/internal/memutil.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/internal/ostringstream.cc" role="src" />
diff --git a/src/abseil-cpp/preprocessed_builds.yaml b/src/abseil-cpp/preprocessed_builds.yaml
index da42450785b..d0d3c8d83a9 100644
--- a/src/abseil-cpp/preprocessed_builds.yaml
+++ b/src/abseil-cpp/preprocessed_builds.yaml
@@ -420,14 +420,6 @@
   headers:
   - third_party/abseil-cpp/absl/debugging/internal/address_is_readable.h
   - third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h
-  - third_party/abseil-cpp/absl/debugging/internal/stacktrace_aarch64-inl.inc
-  - third_party/abseil-cpp/absl/debugging/internal/stacktrace_arm-inl.inc
-  - third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
-  - third_party/abseil-cpp/absl/debugging/internal/stacktrace_generic-inl.inc
-  - third_party/abseil-cpp/absl/debugging/internal/stacktrace_powerpc-inl.inc
-  - third_party/abseil-cpp/absl/debugging/internal/stacktrace_unimplemented-inl.inc
-  - third_party/abseil-cpp/absl/debugging/internal/stacktrace_win32-inl.inc
-  - third_party/abseil-cpp/absl/debugging/internal/stacktrace_x86-inl.inc
   - third_party/abseil-cpp/absl/debugging/internal/vdso_support.h
   name: absl/debugging:debugging_internal
   src:
@@ -491,6 +483,14 @@
   - absl/base:core_headers
   - absl/debugging:debugging_internal
   headers:
+  - third_party/abseil-cpp/absl/debugging/internal/stacktrace_aarch64-inl.inc
+  - third_party/abseil-cpp/absl/debugging/internal/stacktrace_arm-inl.inc
+  - third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
+  - third_party/abseil-cpp/absl/debugging/internal/stacktrace_generic-inl.inc
+  - third_party/abseil-cpp/absl/debugging/internal/stacktrace_powerpc-inl.inc
+  - third_party/abseil-cpp/absl/debugging/internal/stacktrace_unimplemented-inl.inc
+  - third_party/abseil-cpp/absl/debugging/internal/stacktrace_win32-inl.inc
+  - third_party/abseil-cpp/absl/debugging/internal/stacktrace_x86-inl.inc
   - third_party/abseil-cpp/absl/debugging/stacktrace.h
   name: absl/debugging:stacktrace
   src:
@@ -516,6 +516,7 @@
   - third_party/abseil-cpp/absl/debugging/symbolize.cc
 - cmake_target: absl::flags_config
   deps:
+  - absl/base:config
   - absl/base:core_headers
   - absl/flags:path_util
   - absl/flags:program_name
@@ -530,12 +531,13 @@
 - cmake_target: absl::flags
   deps:
   - absl/base:base
+  - absl/base:config
   - absl/base:core_headers
   - absl/flags:config
   - absl/flags:flag_internal
   - absl/flags:handle
   - absl/flags:marshalling
-  - absl/memory:memory
+  - absl/flags:registry
   - absl/strings:strings
   headers:
   - third_party/abseil-cpp/absl/flags/declare.h
@@ -545,7 +547,9 @@
   - third_party/abseil-cpp/absl/flags/flag.cc
 - cmake_target: absl::flags_internal
   deps:
+  - absl/base:config
   - absl/base:core_headers
+  - absl/flags:config
   - absl/flags:handle
   - absl/flags:registry
   - absl/memory:memory
@@ -558,18 +562,20 @@
   - third_party/abseil-cpp/absl/flags/internal/flag.cc
 - cmake_target: absl::flags_handle
   deps:
+  - absl/base:config
   - absl/base:core_headers
-  - absl/flags:config
   - absl/flags:marshalling
+  - absl/strings:strings
   - absl/types:optional
   headers:
   - third_party/abseil-cpp/absl/flags/internal/commandlineflag.h
   name: absl/flags:handle
-  src:
-  - third_party/abseil-cpp/absl/flags/internal/commandlineflag.cc
+  src: []
 - cmake_target: absl::flags_marshalling
   deps:
+  - absl/base:config
   - absl/base:core_headers
+  - absl/base:log_severity
   - absl/strings:str_format
   - absl/strings:strings
   headers:
@@ -579,8 +585,12 @@
   - third_party/abseil-cpp/absl/flags/marshalling.cc
 - cmake_target: absl::flags_parse
   deps:
+  - absl/base:config
+  - absl/base:core_headers
   - absl/flags:config
   - absl/flags:flag
+  - absl/flags:flag_internal
+  - absl/flags:handle
   - absl/flags:program_name
   - absl/flags:registry
   - absl/flags:usage
@@ -595,6 +605,7 @@
   - third_party/abseil-cpp/absl/flags/parse.cc
 - cmake_target: absl::flags_path_util
   deps:
+  - absl/base:config
   - absl/strings:strings
   headers:
   - third_party/abseil-cpp/absl/flags/internal/path_util.h
@@ -602,6 +613,8 @@
   src: []
 - cmake_target: absl::flags_program_name
   deps:
+  - absl/base:config
+  - absl/base:core_headers
   - absl/flags:path_util
   - absl/strings:strings
   - absl/synchronization:synchronization
@@ -612,8 +625,8 @@
   - third_party/abseil-cpp/absl/flags/internal/program_name.cc
 - cmake_target: absl::flags_registry
   deps:
+  - absl/base:config
   - absl/base:core_headers
-  - absl/base:dynamic_annotations
   - absl/base:raw_logging_internal
   - absl/flags:config
   - absl/flags:handle
@@ -628,6 +641,8 @@
   - third_party/abseil-cpp/absl/flags/internal/type_erased.cc
 - cmake_target: absl::flags_usage
   deps:
+  - absl/base:config
+  - absl/base:core_headers
   - absl/flags:usage_internal
   - absl/strings:strings
   - absl/synchronization:synchronization
@@ -638,13 +653,16 @@
   - third_party/abseil-cpp/absl/flags/usage.cc
 - cmake_target: absl::flags_usage_internal
   deps:
+  - absl/base:config
+  - absl/base:core_headers
   - absl/flags:config
   - absl/flags:flag
+  - absl/flags:flag_internal
   - absl/flags:handle
   - absl/flags:path_util
   - absl/flags:program_name
+  - absl/flags:registry
   - absl/strings:strings
-  - absl/synchronization:synchronization
   headers:
   - third_party/abseil-cpp/absl/flags/internal/usage.h
   name: absl/flags:usage_internal
@@ -1086,6 +1104,7 @@
   - third_party/abseil-cpp/absl/strings/escaping.h
   - third_party/abseil-cpp/absl/strings/internal/charconv_bigint.h
   - third_party/abseil-cpp/absl/strings/internal/charconv_parse.h
+  - third_party/abseil-cpp/absl/strings/internal/escaping.h
   - third_party/abseil-cpp/absl/strings/internal/memutil.h
   - third_party/abseil-cpp/absl/strings/internal/stl_type_traits.h
   - third_party/abseil-cpp/absl/strings/internal/str_join_internal.h
@@ -1106,6 +1125,7 @@
   - third_party/abseil-cpp/absl/strings/escaping.cc
   - third_party/abseil-cpp/absl/strings/internal/charconv_bigint.cc
   - third_party/abseil-cpp/absl/strings/internal/charconv_parse.cc
+  - third_party/abseil-cpp/absl/strings/internal/escaping.cc
   - third_party/abseil-cpp/absl/strings/internal/memutil.cc
   - third_party/abseil-cpp/absl/strings/match.cc
   - third_party/abseil-cpp/absl/strings/numbers.cc
diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py
index 4176d2c7823..1d48bf39fa9 100644
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@@ -445,6 +445,7 @@ CORE_SOURCE_FILES = [
     'third_party/abseil-cpp/absl/strings/escaping.cc',
     'third_party/abseil-cpp/absl/strings/internal/charconv_bigint.cc',
     'third_party/abseil-cpp/absl/strings/internal/charconv_parse.cc',
+    'third_party/abseil-cpp/absl/strings/internal/escaping.cc',
     'third_party/abseil-cpp/absl/strings/internal/memutil.cc',
     'third_party/abseil-cpp/absl/strings/internal/ostringstream.cc',
     'third_party/abseil-cpp/absl/strings/internal/utf8.cc',
diff --git a/third_party/abseil-cpp b/third_party/abseil-cpp
index bf86cfe165e..a2e6adecc29 160000
--- a/third_party/abseil-cpp
+++ b/third_party/abseil-cpp
@@ -1 +1 @@
-Subproject commit bf86cfe165ef7d70dfe68f0b8fc0c018bc79a577
+Subproject commit a2e6adecc294dc4cd98cc285a9134ce58e0f2ad0
diff --git a/tools/run_tests/sanity/check_submodules.sh b/tools/run_tests/sanity/check_submodules.sh
index 7c753b38ddf..2395985556a 100755
--- a/tools/run_tests/sanity/check_submodules.sh
+++ b/tools/run_tests/sanity/check_submodules.sh
@@ -26,7 +26,7 @@ want_submodules=$(mktemp /tmp/submXXXXXX)
 
 git submodule | awk '{ print $1 }' | sort > "$submodules"
 cat << EOF | awk '{ print $1 }' | sort > "$want_submodules"
- bf86cfe165ef7d70dfe68f0b8fc0c018bc79a577 third_party/abseil-cpp (heads/master)
+ a2e6adecc294dc4cd98cc285a9134ce58e0f2ad0 third_party/abseil-cpp (heads/master)
  090faecb454fbd6e6e17a75ef8146acb037118d4 third_party/benchmark (v1.5.0)
  73594cde8c9a52a102c4341c244c833aa61b9c06 third_party/bloaty (remotes/origin/wide-14-g73594cd)
  7f02881e96e51f1873afcf384d02f782b48967ca third_party/boringssl (remotes/origin/HEAD)