Google-internal change.

PiperOrigin-RevId: 559539947
Change-Id: I671dd838eb21f9560703d0a046ea79069ae89b74
diff --git a/cc_bindings_from_rs/test/bazel/build_rs_out_dir/BUILD b/cc_bindings_from_rs/test/bazel/build_rs_out_dir/BUILD
index e963b9d..7338e14 100644
--- a/cc_bindings_from_rs/test/bazel/build_rs_out_dir/BUILD
+++ b/cc_bindings_from_rs/test/bazel/build_rs_out_dir/BUILD
@@ -20,7 +20,7 @@
     "//cc_bindings_from_rs/bazel_support:cc_bindings_from_rust_rule.bzl",
     "cc_bindings_from_rust",
 )
-load("//cc_bindings_from_rs:test/crubit_cc_test.bzl", "crubit_cc_test")
+load("//common:crubit_wrapper_macros_oss.bzl", crubit_cc_test = "crubit_on_demand_cc_test")
 
 cargo_build_script(
     name = "build_rs_out_dir_build_script",
diff --git a/cc_bindings_from_rs/test/bazel/crate_features/BUILD b/cc_bindings_from_rs/test/bazel/crate_features/BUILD
index 51f1afb..877a196 100644
--- a/cc_bindings_from_rs/test/bazel/crate_features/BUILD
+++ b/cc_bindings_from_rs/test/bazel/crate_features/BUILD
@@ -6,7 +6,7 @@
     "//cc_bindings_from_rs/bazel_support:cc_bindings_from_rust_rule.bzl",
     "cc_bindings_from_rust",
 )
-load("//cc_bindings_from_rs:test/crubit_cc_test.bzl", "crubit_cc_test")
+load("//common:crubit_wrapper_macros_oss.bzl", crubit_cc_test = "crubit_on_demand_cc_test")
 
 package(default_applicable_licenses = ["//:license"])
 
diff --git a/cc_bindings_from_rs/test/bazel/crate_name/BUILD b/cc_bindings_from_rs/test/bazel/crate_name/BUILD
index f093caf..11c5811 100644
--- a/cc_bindings_from_rs/test/bazel/crate_name/BUILD
+++ b/cc_bindings_from_rs/test/bazel/crate_name/BUILD
@@ -10,7 +10,7 @@
     "//cc_bindings_from_rs/bazel_support:cc_bindings_from_rust_rule.bzl",
     "cc_bindings_from_rust",
 )
-load("//cc_bindings_from_rs:test/crubit_cc_test.bzl", "crubit_cc_test")
+load("//common:crubit_wrapper_macros_oss.bzl", crubit_cc_test = "crubit_on_demand_cc_test")
 
 rust_library(
     name = "custom_crate_name",  # <- This is an important part of this test.
diff --git a/cc_bindings_from_rs/test/bazel/cross_crate/BUILD b/cc_bindings_from_rs/test/bazel/cross_crate/BUILD
index b9d7842..03e447e 100644
--- a/cc_bindings_from_rs/test/bazel/cross_crate/BUILD
+++ b/cc_bindings_from_rs/test/bazel/cross_crate/BUILD
@@ -9,7 +9,7 @@
     "//cc_bindings_from_rs/bazel_support:cc_bindings_from_rust_rule.bzl",
     "cc_bindings_from_rust",
 )
-load("//cc_bindings_from_rs:test/crubit_cc_test.bzl", "crubit_cc_test")
+load("//common:crubit_wrapper_macros_oss.bzl", crubit_cc_test = "crubit_on_demand_cc_test")
 
 rust_library(
     name = "other_crate",
diff --git a/cc_bindings_from_rs/test/bazel/env/BUILD b/cc_bindings_from_rs/test/bazel/env/BUILD
index 87d26b2..c07f142 100644
--- a/cc_bindings_from_rs/test/bazel/env/BUILD
+++ b/cc_bindings_from_rs/test/bazel/env/BUILD
@@ -6,7 +6,7 @@
     "//cc_bindings_from_rs/bazel_support:cc_bindings_from_rust_rule.bzl",
     "cc_bindings_from_rust",
 )
-load("//cc_bindings_from_rs:test/crubit_cc_test.bzl", "crubit_cc_test")
+load("//common:crubit_wrapper_macros_oss.bzl", crubit_cc_test = "crubit_on_demand_cc_test")
 
 package(default_applicable_licenses = ["//:license"])
 
diff --git a/cc_bindings_from_rs/test/bazel/include_str/BUILD b/cc_bindings_from_rs/test/bazel/include_str/BUILD
index 6783fcf..11e7d4e 100644
--- a/cc_bindings_from_rs/test/bazel/include_str/BUILD
+++ b/cc_bindings_from_rs/test/bazel/include_str/BUILD
@@ -10,7 +10,7 @@
     "//cc_bindings_from_rs/bazel_support:cc_bindings_from_rust_rule.bzl",
     "cc_bindings_from_rust",
 )
-load("//cc_bindings_from_rs:test/crubit_cc_test.bzl", "crubit_cc_test")
+load("//common:crubit_wrapper_macros_oss.bzl", crubit_cc_test = "crubit_on_demand_cc_test")
 
 rust_library(
     name = "include_str",
diff --git a/cc_bindings_from_rs/test/functions/BUILD b/cc_bindings_from_rs/test/functions/BUILD
index d948a15..9bcc79f 100644
--- a/cc_bindings_from_rs/test/functions/BUILD
+++ b/cc_bindings_from_rs/test/functions/BUILD
@@ -9,7 +9,7 @@
     "//cc_bindings_from_rs/bazel_support:cc_bindings_from_rust_rule.bzl",
     "cc_bindings_from_rust",
 )
-load("//cc_bindings_from_rs:test/crubit_cc_test.bzl", "crubit_cc_test")
+load("//common:crubit_wrapper_macros_oss.bzl", crubit_cc_test = "crubit_on_demand_cc_test")
 
 package(default_applicable_licenses = ["//:license"])
 
diff --git a/cc_bindings_from_rs/test/impls/BUILD b/cc_bindings_from_rs/test/impls/BUILD
index 8e07ebe..8f2d73c 100644
--- a/cc_bindings_from_rs/test/impls/BUILD
+++ b/cc_bindings_from_rs/test/impls/BUILD
@@ -9,7 +9,7 @@
     "//cc_bindings_from_rs/bazel_support:cc_bindings_from_rust_rule.bzl",
     "cc_bindings_from_rust",
 )
-load("//cc_bindings_from_rs:test/crubit_cc_test.bzl", "crubit_cc_test")
+load("//common:crubit_wrapper_macros_oss.bzl", crubit_cc_test = "crubit_on_demand_cc_test")
 
 rust_library(
     name = "impls",
diff --git a/cc_bindings_from_rs/test/known_traits/clone/BUILD b/cc_bindings_from_rs/test/known_traits/clone/BUILD
index 86be87b..e34176e 100644
--- a/cc_bindings_from_rs/test/known_traits/clone/BUILD
+++ b/cc_bindings_from_rs/test/known_traits/clone/BUILD
@@ -8,7 +8,7 @@
     "//cc_bindings_from_rs/bazel_support:cc_bindings_from_rust_rule.bzl",
     "cc_bindings_from_rust",
 )
-load("//cc_bindings_from_rs:test/crubit_cc_test.bzl", "crubit_cc_test")
+load("//common:crubit_wrapper_macros_oss.bzl", crubit_cc_test = "crubit_on_demand_cc_test")
 
 package(default_applicable_licenses = ["//:license"])
 
diff --git a/cc_bindings_from_rs/test/known_traits/copy/BUILD b/cc_bindings_from_rs/test/known_traits/copy/BUILD
index f29491b..42b4cbd 100644
--- a/cc_bindings_from_rs/test/known_traits/copy/BUILD
+++ b/cc_bindings_from_rs/test/known_traits/copy/BUILD
@@ -8,7 +8,7 @@
     "//cc_bindings_from_rs/bazel_support:cc_bindings_from_rust_rule.bzl",
     "cc_bindings_from_rust",
 )
-load("//cc_bindings_from_rs:test/crubit_cc_test.bzl", "crubit_cc_test")
+load("//common:crubit_wrapper_macros_oss.bzl", crubit_cc_test = "crubit_on_demand_cc_test")
 
 package(default_applicable_licenses = ["//:license"])
 
diff --git a/cc_bindings_from_rs/test/known_traits/default/BUILD b/cc_bindings_from_rs/test/known_traits/default/BUILD
index 9f54ca6..1c379d5 100644
--- a/cc_bindings_from_rs/test/known_traits/default/BUILD
+++ b/cc_bindings_from_rs/test/known_traits/default/BUILD
@@ -8,7 +8,7 @@
     "//cc_bindings_from_rs/bazel_support:cc_bindings_from_rust_rule.bzl",
     "cc_bindings_from_rust",
 )
-load("//cc_bindings_from_rs:test/crubit_cc_test.bzl", "crubit_cc_test")
+load("//common:crubit_wrapper_macros_oss.bzl", crubit_cc_test = "crubit_on_demand_cc_test")
 
 package(default_applicable_licenses = ["//:license"])
 
diff --git a/cc_bindings_from_rs/test/known_traits/drop/BUILD b/cc_bindings_from_rs/test/known_traits/drop/BUILD
index 583c0a8..c213463 100644
--- a/cc_bindings_from_rs/test/known_traits/drop/BUILD
+++ b/cc_bindings_from_rs/test/known_traits/drop/BUILD
@@ -8,7 +8,7 @@
     "//cc_bindings_from_rs/bazel_support:cc_bindings_from_rust_rule.bzl",
     "cc_bindings_from_rust",
 )
-load("//cc_bindings_from_rs:test/crubit_cc_test.bzl", "crubit_cc_test")
+load("//common:crubit_wrapper_macros_oss.bzl", crubit_cc_test = "crubit_on_demand_cc_test")
 
 package(default_applicable_licenses = ["//:license"])
 
diff --git a/cc_bindings_from_rs/test/modules/BUILD b/cc_bindings_from_rs/test/modules/BUILD
index 0e46c5b..75805b4 100644
--- a/cc_bindings_from_rs/test/modules/BUILD
+++ b/cc_bindings_from_rs/test/modules/BUILD
@@ -9,7 +9,7 @@
     "//cc_bindings_from_rs/bazel_support:cc_bindings_from_rust_rule.bzl",
     "cc_bindings_from_rust",
 )
-load("//cc_bindings_from_rs:test/crubit_cc_test.bzl", "crubit_cc_test")
+load("//common:crubit_wrapper_macros_oss.bzl", crubit_cc_test = "crubit_on_demand_cc_test")
 
 package(default_applicable_licenses = ["//:license"])
 
diff --git a/cc_bindings_from_rs/test/structs/BUILD b/cc_bindings_from_rs/test/structs/BUILD
index ffed91e..b5fa386 100644
--- a/cc_bindings_from_rs/test/structs/BUILD
+++ b/cc_bindings_from_rs/test/structs/BUILD
@@ -9,7 +9,7 @@
     "//cc_bindings_from_rs/bazel_support:cc_bindings_from_rust_rule.bzl",
     "cc_bindings_from_rust",
 )
-load("//cc_bindings_from_rs:test/crubit_cc_test.bzl", "crubit_cc_test")
+load("//common:crubit_wrapper_macros_oss.bzl", crubit_cc_test = "crubit_on_demand_cc_test")
 
 package(default_applicable_licenses = ["//:license"])