From 0e29c9448921025d6e4606e5b63f032c1f9b34d8 Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Thu, 17 Aug 2023 12:52:13 -0700 Subject: [PATCH 1/5] Revert "Revert "Build iOS unittest target in unopt builds" (#44356)" This reverts commit f35213f616335d0caeec3b86d45919ca5967060b. --- shell/platform/darwin/ios/BUILD.gn | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/shell/platform/darwin/ios/BUILD.gn b/shell/platform/darwin/ios/BUILD.gn index b6b1799365585..6c1f2d4d65b31 100644 --- a/shell/platform/darwin/ios/BUILD.gn +++ b/shell/platform/darwin/ios/BUILD.gn @@ -263,7 +263,6 @@ source_set("ios_test_flutter_mrc") { } shared_library("ios_test_flutter") { - testonly = true visibility = [ ":*" ] cflags = [ "-fvisibility=default", @@ -302,7 +301,6 @@ shared_library("ios_test_flutter") { "framework/Source/connection_collection_test.mm", ] deps = [ - ":flutter_framework", ":flutter_framework_source", ":flutter_framework_source_arc", ":ios_gpu_configuration", @@ -465,4 +463,8 @@ action("flutter_framework") { ] deps = [ ":universal_flutter_framework" ] + + if (is_debug) { + deps += [ ":ios_test_flutter" ] + } } From 75b569740b4efe825a9a9e9ee8c9b49467d4dfb9 Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Fri, 18 Aug 2023 10:45:11 -0700 Subject: [PATCH 2/5] review --- shell/platform/darwin/BUILD.gn | 3 +++ shell/platform/darwin/ios/BUILD.gn | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/shell/platform/darwin/BUILD.gn b/shell/platform/darwin/BUILD.gn index c1db2da1341dc..4e04cff926c18 100644 --- a/shell/platform/darwin/BUILD.gn +++ b/shell/platform/darwin/BUILD.gn @@ -9,6 +9,9 @@ import("//flutter/shell/platform/config.gni") group("darwin") { if (is_ios) { deps = [ "ios:flutter_framework" ] + if (is_debug) { + deps += [ "//flutter/shell/platform/darwin/ios:ios_test_flutter" ] + } } if (is_mac) { deps = [] diff --git a/shell/platform/darwin/ios/BUILD.gn b/shell/platform/darwin/ios/BUILD.gn index 6c1f2d4d65b31..550f20b76c6da 100644 --- a/shell/platform/darwin/ios/BUILD.gn +++ b/shell/platform/darwin/ios/BUILD.gn @@ -263,7 +263,10 @@ source_set("ios_test_flutter_mrc") { } shared_library("ios_test_flutter") { - visibility = [ ":*" ] + visibility = [ + ":*", + "//flutter/shell/platform/darwin:*", + ] cflags = [ "-fvisibility=default", "-F$platform_frameworks_path", @@ -301,6 +304,7 @@ shared_library("ios_test_flutter") { "framework/Source/connection_collection_test.mm", ] deps = [ + ":flutter_framework", ":flutter_framework_source", ":flutter_framework_source_arc", ":ios_gpu_configuration", @@ -463,8 +467,4 @@ action("flutter_framework") { ] deps = [ ":universal_flutter_framework" ] - - if (is_debug) { - deps += [ ":ios_test_flutter" ] - } } From 26438bec3bada38335a1a8f6ec5b17a5f1eec4c6 Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Tue, 22 Aug 2023 09:06:39 -0700 Subject: [PATCH 3/5] review --- BUILD.gn | 4 ++++ ci/builders/mac_unopt.json | 9 +++------ shell/platform/darwin/BUILD.gn | 3 --- shell/platform/darwin/ios/BUILD.gn | 4 ++-- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 05fbbb093360a..704c0f2c8628d 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -149,6 +149,10 @@ group("unittests") { [ "//flutter/shell/platform/android:flutter_shell_native_unittests" ] } + if (is_ios) { + public_deps += [ "//flutter/shell/platform/darwin/ios:ios_test_flutter" ] + } + # Compile all unittests targets if enabled. if (enable_unittests) { public_deps += [ diff --git a/ci/builders/mac_unopt.json b/ci/builders/mac_unopt.json index 1be5de70ffcab..e0cf50f57f1a7 100644 --- a/ci/builders/mac_unopt.json +++ b/ci/builders/mac_unopt.json @@ -87,8 +87,7 @@ "ninja": { "config": "ios_debug_sim", "targets": [ - "flutter/testing/scenario_app", - "flutter/shell/platform/darwin/ios:ios_test_flutter" + "flutter/testing/scenario_app" ] }, "tests": [ @@ -196,8 +195,7 @@ "ninja": { "config": "ios_debug_sim_arm64", "targets": [ - "flutter/testing/scenario_app", - "flutter/shell/platform/darwin/ios:ios_test_flutter" + "flutter/testing/scenario_app" ] }, "tests": [ @@ -267,8 +265,7 @@ "ninja": { "config": "ios_debug_sim_arm64_extension_safe", "targets": [ - "flutter/testing/scenario_app", - "flutter/shell/platform/darwin/ios:ios_test_flutter" + "flutter/testing/scenario_app" ] }, "tests": [ diff --git a/shell/platform/darwin/BUILD.gn b/shell/platform/darwin/BUILD.gn index 4e04cff926c18..c1db2da1341dc 100644 --- a/shell/platform/darwin/BUILD.gn +++ b/shell/platform/darwin/BUILD.gn @@ -9,9 +9,6 @@ import("//flutter/shell/platform/config.gni") group("darwin") { if (is_ios) { deps = [ "ios:flutter_framework" ] - if (is_debug) { - deps += [ "//flutter/shell/platform/darwin/ios:ios_test_flutter" ] - } } if (is_mac) { deps = [] diff --git a/shell/platform/darwin/ios/BUILD.gn b/shell/platform/darwin/ios/BUILD.gn index 550f20b76c6da..98ae389e1a554 100644 --- a/shell/platform/darwin/ios/BUILD.gn +++ b/shell/platform/darwin/ios/BUILD.gn @@ -263,9 +263,9 @@ source_set("ios_test_flutter_mrc") { } shared_library("ios_test_flutter") { + testonly = true visibility = [ - ":*", - "//flutter/shell/platform/darwin:*", + "*" ] cflags = [ "-fvisibility=default", From db6cb09e9d40741f142b17abde546c144ad92a94 Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Tue, 22 Aug 2023 09:08:17 -0700 Subject: [PATCH 4/5] format --- shell/platform/darwin/ios/BUILD.gn | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/shell/platform/darwin/ios/BUILD.gn b/shell/platform/darwin/ios/BUILD.gn index 98ae389e1a554..4e18db30befb3 100644 --- a/shell/platform/darwin/ios/BUILD.gn +++ b/shell/platform/darwin/ios/BUILD.gn @@ -264,9 +264,7 @@ source_set("ios_test_flutter_mrc") { shared_library("ios_test_flutter") { testonly = true - visibility = [ - "*" - ] + visibility = [ "*" ] cflags = [ "-fvisibility=default", "-F$platform_frameworks_path", From 01c77ef1d2d622d1c9aeb52d2d45d0fc8b15fb35 Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Tue, 22 Aug 2023 09:37:50 -0700 Subject: [PATCH 5/5] fix --- ci/builders/mac_unopt.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ci/builders/mac_unopt.json b/ci/builders/mac_unopt.json index e0cf50f57f1a7..1be5de70ffcab 100644 --- a/ci/builders/mac_unopt.json +++ b/ci/builders/mac_unopt.json @@ -87,7 +87,8 @@ "ninja": { "config": "ios_debug_sim", "targets": [ - "flutter/testing/scenario_app" + "flutter/testing/scenario_app", + "flutter/shell/platform/darwin/ios:ios_test_flutter" ] }, "tests": [ @@ -195,7 +196,8 @@ "ninja": { "config": "ios_debug_sim_arm64", "targets": [ - "flutter/testing/scenario_app" + "flutter/testing/scenario_app", + "flutter/shell/platform/darwin/ios:ios_test_flutter" ] }, "tests": [ @@ -265,7 +267,8 @@ "ninja": { "config": "ios_debug_sim_arm64_extension_safe", "targets": [ - "flutter/testing/scenario_app" + "flutter/testing/scenario_app", + "flutter/shell/platform/darwin/ios:ios_test_flutter" ] }, "tests": [