From 5afd3d1d4ae46567a7a0484fa0da9c90c561cb04 Mon Sep 17 00:00:00 2001 From: hezhengyi Date: Mon, 11 Dec 2023 11:10:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9is=5Fohos=E4=B8=8D=E8=AF=86?= =?UTF-8?q?=E5=88=AB=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: hezhengyi --- attachment/repos/build4.bin | 39 ++++++++++++------- .../ios/platform_message_handler_ios.mm | 2 +- 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/attachment/repos/build4.bin b/attachment/repos/build4.bin index 6094a9a9cc..c7c42c6496 100644 --- a/attachment/repos/build4.bin +++ b/attachment/repos/build4.bin @@ -1,5 +1,5 @@ diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn -index bd3476a..f1c88b9 100644 +index bd3476a..d789796 100644 --- a/build/config/BUILDCONFIG.gn +++ b/build/config/BUILDCONFIG.gn @@ -36,7 +36,7 @@ @@ -24,18 +24,22 @@ index bd3476a..f1c88b9 100644 } } -@@ -261,27 +258,13 @@ if (current_os == "win") { +@@ -257,31 +254,18 @@ if (current_os == "win") { + is_fuchsia_host = false + is_ios = true + is_linux = false ++ is_ohos = false + is_mac = false is_posix = true is_win = false is_wasm = false -} else if (current_os == "linux" && target_os == "ohos") { - target_os="linux" -+} else if (current_os == "ohos") { - is_android = false - is_chromeos = false - is_fuchsia = false - is_fuchsia_host = false - is_ios = false +- is_android = false +- is_chromeos = false +- is_fuchsia = false +- is_fuchsia_host = false +- is_ios = false - is_linux = true - is_ohos = true - is_mac = false @@ -44,13 +48,22 @@ index bd3476a..f1c88b9 100644 - is_wasm = false -} else if ((current_os == "ohos" || current_os == "linux") && host_os == "mac") { - target_os="linux" -- is_android = false -- is_chromeos = false -- is_fuchsia = false -- is_fuchsia_host = false -- is_ios = false ++} else if (current_os == "ohos") { + is_android = false + is_chromeos = false + is_fuchsia = false + is_fuchsia_host = false + is_ios = false - is_linux = true + is_linux = false is_ohos = true is_mac = false is_posix = true +@@ -318,6 +302,7 @@ if (current_os == "win") { + is_fuchsia_host = false + is_ios = false + is_linux = false ++ is_ohos = false + is_mac = false + is_posix = false + is_win = false diff --git a/shell/platform/darwin/ios/platform_message_handler_ios.mm b/shell/platform/darwin/ios/platform_message_handler_ios.mm index cf510bc301..a5a2b15169 100644 --- a/shell/platform/darwin/ios/platform_message_handler_ios.mm +++ b/shell/platform/darwin/ios/platform_message_handler_ios.mm @@ -16,7 +16,7 @@ static uint64_t platform_message_counter = 1; @end @interface FLTSerialTaskQueue : NSObject -@property(nonatomic, strong) dispatch_queue_t queue; +@property(nonatomic, assign) dispatch_queue_t queue; @end @implementation FLTSerialTaskQueue -- Gitee