diff --git a/attachment/repos/build4.bin b/attachment/repos/build4.bin index 6094a9a9cc4c32f82ba54a64d6a0e8fd2fc8c849..c7c42c649625266e3cbfbc1f9e6507917f64a552 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 cf510bc301fef2ff263da0e37c5bead5ce0d138e..a5a2b151690ac3e402d6965074417c8d1ddd1740 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