From a67957a1687efd4f757d7f3f590745f21bae33e4 Mon Sep 17 00:00:00 2001
From: Simon Krueger <skrueger@meta.com>
Date: Thu, 13 Nov 2025 13:46:15 -0800
Subject: [PATCH] Migrate re2 usages

Summary:
This updates the usages of re2 dependencies from `third-party//re2:re2` to `fbsource//third-party/re2:re2` for project white lotus.

`third-party//re2:re2` is already translated to `fbsource//third-party/re2:re2` by the white lotus redirection list in, so these changes do NOT cause any functional behavior changes.

After all usages of re2 are migrated, the next step is to enable a tripwire on its usage in white_lotus.bzl and then remove existing translations in `deps_remappings.bzl` and `xplat_virtual_cells.bzl`

Reviewed By: dtolnay

Differential Revision: D86929111
---
 targets.bzl      | 16 +++++-----------
 test/targets.bzl |  8 ++------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/targets.bzl b/targets.bzl
index 3198c79..0dcb023 100644
--- a/targets.bzl
+++ b/targets.bzl
@@ -30,11 +30,9 @@ def define_common_targets():
             "src/regex.cpp",
         ],
         exported_deps = [
+            "fbsource//third-party/re2:re2",
             ":headers",
         ],
-        exported_external_deps = [
-            "re2",
-        ],
         visibility = ["//pytorch/tokenizers/..."],
         header_namespace = "",
         platforms = PLATFORMS,
@@ -75,11 +73,9 @@ def define_common_targets():
             "src/bpe_tokenizer_base.cpp",
         ],
         exported_deps = [
+            "fbsource//third-party/re2:re2",
             ":headers",
         ],
-        exported_external_deps = [
-            "re2",
-        ],
         visibility = [
             "//pytorch/tokenizers/...",
         ],
@@ -117,12 +113,10 @@ def define_common_targets():
             ":regex",
         ],
         exported_deps = [
+            "fbsource//third-party/re2:re2",
             ":bpe_tokenizer_base",
             ":headers",
         ],
-        exported_external_deps = [
-            "re2",
-        ],
         visibility = [
             "@EXECUTORCH_CLIENTS",
             "//pytorch/tokenizers/...",
@@ -142,6 +136,7 @@ def define_common_targets():
             ":regex",
         ],
         exported_deps = [
+            "fbsource//third-party/re2:re2",
             ":bpe_tokenizer_base",
             ":headers",
             "//pytorch/tokenizers/third-party:unicode",
@@ -151,7 +146,6 @@ def define_common_targets():
             "//pytorch/tokenizers/...",
         ],
         exported_external_deps = [
-            "re2",
             "nlohmann_json",
         ],
         platforms = PLATFORMS,
@@ -181,11 +175,11 @@ def define_common_targets():
             ":regex",
         ],
         exported_deps = [
+            "fbsource//third-party/re2:re2",
             ":bpe_tokenizer_base",
             ":headers",
         ],
         exported_external_deps = [
-            "re2",
             "nlohmann_json",
         ],
         visibility = [
diff --git a/test/targets.bzl b/test/targets.bzl
index 1655a69..46f75bf 100644
--- a/test/targets.bzl
+++ b/test/targets.bzl
@@ -68,15 +68,13 @@ def define_common_targets():
             "test_string_integer_map.cpp",
         ],
         deps = [
+            "fbsource//third-party/re2:re2",
             "//pytorch/tokenizers:headers",
         ],
         env = {
             "RESOURCES_PATH": "$(location :resources)/resources",
         },
         platforms = [CXX, ANDROID],  # Cannot bundle resources on Apple platform.
-        external_deps = [
-            "re2",
-        ],
     )
 
     runtime.cxx_test(
@@ -85,15 +83,13 @@ def define_common_targets():
             "test_tiktoken.cpp",
         ],
         deps = [
+            "fbsource//third-party/re2:re2",
             "//pytorch/tokenizers:tiktoken",
         ],
         env = {
             "RESOURCES_PATH": "$(location :resources)/resources",
         },
         platforms = [CXX, ANDROID],  # Cannot bundle resources on Apple platform.
-        external_deps = [
-            "re2",
-        ],
     )
 
     runtime.cxx_test(