From 4d333938a246cfc02de64259a4b81bf5df921c99 Mon Sep 17 00:00:00 2001 From: ganchuantao Date: Wed, 2 Jul 2025 09:36:19 +0000 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3IOS=20=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: ganchuantao --- BUILD.gn | 1 + third_party/abseil-cpp/absl/base/options.h | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/BUILD.gn b/BUILD.gn index dac18db..2123f35 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -748,6 +748,7 @@ ohos_executable("protoc") { "-Wno-deprecated-declarations", ] if (is_arkui_x) { + defines = [ "ARK_UI_X" ] deps += [ "//third_party/abseil-cpp:absl_base_static" ] } else { external_deps = [ "abseil-cpp:absl_base_static" ] diff --git a/third_party/abseil-cpp/absl/base/options.h b/third_party/abseil-cpp/absl/base/options.h index 5caa58f..0daa8a0 100644 --- a/third_party/abseil-cpp/absl/base/options.h +++ b/third_party/abseil-cpp/absl/base/options.h @@ -174,7 +174,11 @@ // absl::variant is a typedef of std::variant, use the feature macro // ABSL_USES_STD_VARIANT. +if defined(ARK_UI_X) +#define ABSL_OPTION_USE_STD_VARIANT 0 +#else #define ABSL_OPTION_USE_STD_VARIANT 2 +#endif // ABSL_OPTION_USE_STD_ORDERING // -- Gitee