Directly include absl/str_cat.h header This is in prepare of abseil uprev by making a local patch onto our mirror of Tink to directly include absl's str_cat header, for resolving the build failure. We are planning on upreving Abseil-cpp to commit a69b0ae5cdba53a45617afc408618a3e1ac244de[1], which is the baseline commit of LTS20230125[2] where str_cat.h is no longer transitively included in. After upreving Abseil-cpp, Tink in Fuchsia will upreved to upstream/master, where `absl/strings/str_cat.h` is still included in `hpke_context.cc` and `md_util.cc`, and the usage of it in `monitoring_util.h` is removed so we expect the header also get removed. [1] https://github.com/abseil/abseil-cpp/commit/a69b0ae5cdba53a45617afc408618a3e1ac244de [2] https://github.com/abseil/abseil-cpp/releases/tag/20230125.0 Bug: b/374990674 Change-Id: Iab3092f19e50f6c99e913d4e15b211670f20cfee Reviewed-on: https://fuchsia-review.googlesource.com/c/third_party/tink/+/1147751 Reviewed-by: Alex Pankhurst <pankhurst@google.com> Commit-Queue: Anivia Li <aniviali@google.com>
diff --git a/cc/hybrid/internal/hpke_context.cc b/cc/hybrid/internal/hpke_context.cc index e0d5675..282db5c 100644 --- a/cc/hybrid/internal/hpke_context.cc +++ b/cc/hybrid/internal/hpke_context.cc
@@ -21,6 +21,7 @@ #include <utility> #include "absl/status/status.h" +#include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "tink/hybrid/internal/hpke_context_boringssl.h" #include "tink/util/secret_data.h"
diff --git a/cc/internal/md_util.cc b/cc/internal/md_util.cc index 1ae26fc..36d36a0 100644 --- a/cc/internal/md_util.cc +++ b/cc/internal/md_util.cc
@@ -18,6 +18,7 @@ #include <string> #include "absl/status/status.h" +#include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "openssl/evp.h" #include "tink/internal/err_util.h"
diff --git a/cc/internal/monitoring_util.h b/cc/internal/monitoring_util.h index 6d62b1c..dbf5e81 100644 --- a/cc/internal/monitoring_util.h +++ b/cc/internal/monitoring_util.h
@@ -21,6 +21,7 @@ #include "absl/container/flat_hash_map.h" #include "absl/status/status.h" +#include "absl/strings/str_cat.h" #include "tink/monitoring/monitoring.h" #include "tink/primitive_set.h" #include "tink/util/statusor.h"