commit 298a1d24ad7b6c30d48bca554e4fbaf6a032e0dd
author Anivia Li <aniviali@google.com> Wed Dec 11 15:08:04 2024 -0800
committer CQ Bot <fuchsia-internal-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Dec 12 11:50:40 2024 -0800
tree 04c1ba1f722de0d9f5db8c7917e094ffd804047f
parent a7eb3f4543c0bab6accc278438e6c6e92bf82c03

Add target hybrid:config_v0

hybrid:config_v0 is required for using the new KeysetHandle::GetPrimitive() function in Cobalt

Bug: 380914357

Change-Id: If94fc828294eba8d2332d96b23480d41dac8b5d4
Reviewed-on: https://fuchsia-review.googlesource.com/c/third_party/tink/+/1172352
Commit-Queue: Anivia Li <aniviali@google.com>
Reviewed-by: Alex Pankhurst <pankhurst@google.com>

cc/hybrid/BUILD.gn

diff --git a/cc/hybrid/BUILD.gn b/cc/hybrid/BUILD.gn
index 772fa94..65fef10 100644
--- a/cc/hybrid/BUILD.gn
+++ b/cc/hybrid/BUILD.gn
@@ -468,6 +468,22 @@
   public_configs = [ "//third_party/tink:tink_config" ]
 }
 
+# CC Library : config_v0
+source_set("config_v0") {
+  configs += [ "//build/config:no_rtti" ]
+  configs -= [ "//build/config:no_rtti" ]
+  sources = [
+    "config_v0.cc",
+    "config_v0.h",
+  ]
+  public_deps = [
+    "//third_party/abseil-cpp/absl/log:check",
+    "//third_party/tink/cc:configuration",
+    "//third_party/tink/cc/hybrid/internal:config_v0",
+  ]
+  public_configs = [ "//third_party/tink:tink_config" ]
+}
+
 # CC Library : ecies_parameters
 source_set("ecies_parameters") {
   configs += [ "//build/config:no_rtti" ]

cc/hybrid/internal/BUILD.gn

diff --git a/cc/hybrid/internal/BUILD.gn b/cc/hybrid/internal/BUILD.gn
index 3d649ef..8f1755f 100644
--- a/cc/hybrid/internal/BUILD.gn
+++ b/cc/hybrid/internal/BUILD.gn
@@ -213,3 +213,26 @@
   ]
   public_configs = [ "//third_party/tink:tink_config" ]
 }
+
+# CC Library : config_v0
+source_set("config_v0") {
+  configs += [ "//build/config:no_rtti" ]
+  configs -= [ "//build/config:no_rtti" ]
+  sources = [
+    "config_v0.cc",
+    "config_v0.h",
+  ]
+  public_deps = [
+    ":hpke_private_key_manager",
+    ":hpke_public_key_manager",
+    "//third_party/abseil-cpp/absl/memory:memory",
+    "//third_party/tink/cc:configuration",
+    "//third_party/tink/cc/hybrid:ecies_aead_hkdf_private_key_manager",
+    "//third_party/tink/cc/hybrid:ecies_aead_hkdf_public_key_manager",
+    "//third_party/tink/cc/hybrid:hybrid_decrypt_wrapper",
+    "//third_party/tink/cc/hybrid:hybrid_encrypt_wrapper",
+    "//third_party/tink/cc/internal:configuration_impl",
+    "//third_party/tink/cc/util:status",
+  ]
+  public_configs = [ "//third_party/tink:tink_config" ]
+}

tools/convert_for_cobalt

diff --git a/tools/convert_for_cobalt b/tools/convert_for_cobalt
index 5d82e99..a4fadb8 100755
--- a/tools/convert_for_cobalt
+++ b/tools/convert_for_cobalt
@@ -798,6 +798,7 @@
   # Targets listed her are the start of the fetch. Put all the targets you plan
   # on directly depending upon here.
   targets = [
+      '//hybrid:config_v0',
       '//hybrid:hybrid_config',
       '//hybrid:hpke_config',
       '//hybrid:hybrid_decrypt_factory',