[fuchsia] Make CFv2 the default for tests.

The default for `use_cfv2` is now `true`. Tests may opt-out by setting it to `false.` Tests are still built/run as CFv1 components if: - They use fuchsia.sys.Launcher (skia_unittests and gfx_unittests). - They use additional_manifest_fragments (many). These will be migrated to CFv2 as their fragments (and their respective required capabilities) are migrated to CFv2. Bug: 1256502 Change-Id: I3ef514d997da29bf4ce80d17b7afa57bbdb107e7 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3447303 Reviewed-by: Wez <wez@chromium.org> Owners-Override: Wez <wez@chromium.org> Commit-Queue: Greg Thompson <grt@chromium.org> Cr-Commit-Position: refs/heads/main@{#968954}
Denger-Network · Feb 9, 2022 · 5e4f41f · 5e4f41f
1 parent 2d51aac
commit 5e4f41f
Show file tree

Hide file tree

Showing 35 changed files with 52 additions and 15 deletions.
diff --git a/base/BUILD.gn b/base/BUILD.gn
@@ -3783,7 +3783,6 @@ test("base_unittests") {
       "//third_party/fuchsia-sdk/sdk/pkg/sys_cpp",
     ]
 
-    use_cfv2 = true
     additional_manifest_fragments =
         [ "//build/config/fuchsia/test/logger.shard.test-cml" ]
   }

diff --git a/build/config/fuchsia/generate_runner_scripts.gni b/build/config/fuchsia/generate_runner_scripts.gni
@@ -244,7 +244,7 @@ template("fuchsia_test_runner") {
       ]
     }
 
-    if (defined(invoker.use_cfv2) && invoker.use_cfv2) {
+    if (!defined(invoker.use_cfv2) || invoker.use_cfv2) {
       executable_args += [ "--component-version=2" ]
     }
 

diff --git a/cc/BUILD.gn b/cc/BUILD.gn
@@ -897,6 +897,7 @@ cc_test("cc_unittests") {
   }
 
   if (is_fuchsia) {
+    use_cfv2 = false
     additional_manifest_fragments = [
       "//build/config/fuchsia/test/font_capabilities.test-cmx",
 

diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
@@ -4130,6 +4130,7 @@ if (!is_android) {
     }
 
     if (is_fuchsia) {
+      use_cfv2 = false
       additional_manifest_fragments = [
         "//build/config/fuchsia/test/font_capabilities.test-cmx",
         "//build/config/fuchsia/test/jit_capabilities.test-cmx",
@@ -8142,6 +8143,7 @@ test("unit_tests") {
 
     data += [ "//testing/buildbot/filters/fuchsia.unit_tests.filter" ]
 
+    use_cfv2 = false
     additional_manifest_fragments = [
       "//build/config/fuchsia/test/font_capabilities.test-cmx",
 

diff --git a/components/BUILD.gn b/components/BUILD.gn
@@ -81,6 +81,7 @@ test("components_unittests") {
   }
 
   if (is_fuchsia) {
+    use_cfv2 = false
     additional_manifest_fragments = [
       "//build/config/fuchsia/test/font_capabilities.test-cmx",
 
@@ -883,6 +884,7 @@ if (!is_ios) {
     }
 
     if (is_fuchsia) {
+      use_cfv2 = false
       additional_manifest_fragments = [
         "//build/config/fuchsia/test/font_capabilities.test-cmx",
         "//build/config/fuchsia/test/jit_capabilities.test-cmx",

diff --git a/components/cronet/BUILD.gn b/components/cronet/BUILD.gn
@@ -160,6 +160,7 @@ if (is_android) {
     }
 
     if (is_fuchsia) {
+      use_cfv2 = false
       additional_manifest_fragments =
           [ "//build/config/fuchsia/test/network_capabilities.test-cmx" ]
     }

diff --git a/components/viz/BUILD.gn b/components/viz/BUILD.gn
@@ -41,6 +41,7 @@ viz_test("viz_unittests") {
   }
 
   if (is_fuchsia) {
+    use_cfv2 = false
     additional_manifest_fragments = [
       # TODO(crbug.com/1185811): Figure out why jit_capabilities is needed.
       "//build/config/fuchsia/test/jit_capabilities.test-cmx",

diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
@@ -1879,6 +1879,7 @@ test("content_browsertests") {
   if (is_fuchsia) {
     use_test_server = true
 
+    use_cfv2 = false
     additional_manifest_fragments = [
       "//build/config/fuchsia/test/audio_capabilities.test-cmx",
       "//build/config/fuchsia/test/font_capabilities.test-cmx",
@@ -2396,6 +2397,7 @@ test("content_unittests") {
       "../browser/accessibility/browser_accessibility_fuchsia_unittest.cc",
       "../browser/accessibility/browser_accessibility_manager_fuchsia_unittest.cc",
     ]
+    use_cfv2 = false
     additional_manifest_fragments = [
       "//build/config/fuchsia/test/font_capabilities.test-cmx",
 

diff --git a/courgette/BUILD.gn b/courgette/BUILD.gn
@@ -230,10 +230,6 @@ test("courgette_unittests") {
   ]
 
   data = [ "testdata/" ]
-
-  if (is_fuchsia) {
-    use_cfv2 = true
-  }
 }
 
 test("courgette_fuzz") {

diff --git a/extensions/BUILD.gn b/extensions/BUILD.gn
@@ -283,6 +283,7 @@ test("extensions_unittests") {
   ]
 
   if (is_fuchsia) {
+    use_cfv2 = false
     additional_manifest_fragments = [
       "//build/config/fuchsia/test/jit_capabilities.test-cmx",
       "//build/config/fuchsia/test/network_capabilities.test-cmx",

diff --git a/fuchsia/engine/BUILD.gn b/fuchsia/engine/BUILD.gn
@@ -494,6 +494,7 @@ test("web_engine_browsertests") {
     "//ui/gfx",
     "//ui/ozone",
   ]
+  use_cfv2 = false
   additional_manifest_fragments = [
     "//build/config/fuchsia/test/jit_capabilities.test-cmx",
     "//build/config/fuchsia/test/network_capabilities.test-cmx",
@@ -567,6 +568,7 @@ test("web_engine_unittests") {
     "//third_party/fuchsia-sdk/sdk/pkg/scenic_cpp",
     "//ui/ozone",
   ]
+  use_cfv2 = false
   additional_manifest_fragments = [
     # TODO(crbug.com/1185811): Figure out why jit_capabilities is needed.
     "//build/config/fuchsia/test/jit_capabilities.test-cmx",
@@ -613,6 +615,7 @@ test("web_engine_integration_tests") {
         ":web_engine",
         "web_engine",
       ] ]
+  use_cfv2 = false
   additional_manifest_fragments = [
     "//build/config/fuchsia/test/network_capabilities.test-cmx",
     "//build/config/fuchsia/test/read_debug_data.test-cmx",

diff --git a/fuchsia/runners/BUILD.gn b/fuchsia/runners/BUILD.gn
@@ -240,6 +240,7 @@ test("cast_runner_integration_tests") {
       "web_engine",
     ],
   ]
+  use_cfv2 = false
   additional_manifest_fragments = [
     "//build/config/fuchsia/test/network_capabilities.test-cmx",
     "//build/config/fuchsia/test/vulkan_capabilities.test-cmx",
@@ -269,6 +270,7 @@ test("cast_runner_browsertests") {
     "//testing/gtest",
     "//ui/ozone",
   ]
+  use_cfv2 = false
   additional_manifest_fragments = [
     "//build/config/fuchsia/test/jit_capabilities.test-cmx",
     "//build/config/fuchsia/test/network_capabilities.test-cmx",
@@ -332,6 +334,7 @@ test("web_runner_integration_tests") {
       "web_runner",
     ],
   ]
+  use_cfv2 = false
   additional_manifest_fragments = [
     "//build/config/fuchsia/test/network_capabilities.test-cmx",
     "//build/config/fuchsia/test/vulkan_capabilities.test-cmx",

diff --git a/gin/BUILD.gn b/gin/BUILD.gn
@@ -195,6 +195,7 @@ test("gin_unittests") {
   }
 
   if (is_fuchsia) {
+    use_cfv2 = false
     additional_manifest_fragments = [
       # TODO(crbug.com/1185811): Figure out why jit_capabilities is needed.
       "//build/config/fuchsia/test/jit_capabilities.test-cmx",

diff --git a/google_apis/BUILD.gn b/google_apis/BUILD.gn
@@ -135,9 +135,7 @@ template("google_apis_tmpl") {
       "google_api_keys.h",
     ]
 
-    configs += [
-      ":key_defines",
-    ]
+    configs += [ ":key_defines" ]
 
     deps = [
       ":oauth2_mint_token_consent_result_proto",
@@ -261,6 +259,7 @@ test("google_apis_unittests") {
   }
 
   if (is_fuchsia) {
+    use_cfv2 = false
     additional_manifest_fragments =
         [ "//build/config/fuchsia/test/network_capabilities.test-cmx" ]
   }

diff --git a/headless/BUILD.gn b/headless/BUILD.gn
@@ -773,10 +773,6 @@ test("headless_unittests") {
   }
 
   configs += [ ":headless_defines_config" ]
-
-  if (is_fuchsia) {
-    use_cfv2 = true
-  }
 }
 
 if (is_mac) {
@@ -839,6 +835,7 @@ test("headless_browsertests") {
   data_deps = [ "//testing/buildbot/filters:headless_browsertests_filters" ]
 
   if (is_fuchsia) {
+    use_cfv2 = false
     additional_manifest_fragments = [
       "//build/config/fuchsia/test/font_capabilities.test-cmx",
 

diff --git a/ipc/BUILD.gn b/ipc/BUILD.gn
@@ -294,7 +294,6 @@ if (!is_ios) {
     }
 
     if (is_fuchsia) {
-      use_cfv2 = true
       sources -= [
         # No AF_UNIX domain sockets on Fuchsia.
         "sync_socket_unittest.cc",

diff --git a/media/BUILD.gn b/media/BUILD.gn
@@ -212,6 +212,7 @@ test("media_unittests") {
       "//media/fuchsia/cdm/service:unittests",
     ]
 
+    use_cfv2 = false
     additional_manifest_fragments = [
       "//build/config/fuchsia/test/audio_capabilities.test-cmx",
 
@@ -281,6 +282,7 @@ test("audio_unittests") {
   }
 
   if (is_fuchsia) {
+    use_cfv2 = false
     additional_manifest_fragments =
         [ "//build/config/fuchsia/test/audio_capabilities.test-cmx" ]
   }

diff --git a/media/capture/BUILD.gn b/media/capture/BUILD.gn
@@ -469,6 +469,7 @@ test("capture_unittests") {
       "video/fuchsia/video_capture_device_factory_fuchsia_test.cc",
       "video/fuchsia/video_capture_device_fuchsia_test.cc",
     ]
+    use_cfv2 = false
     additional_manifest_fragments = [
       "//build/config/fuchsia/test/web_engine_required_capabilities.test-cmx",
     ]

diff --git a/net/BUILD.gn b/net/BUILD.gn
@@ -4610,6 +4610,7 @@ test("net_unittests") {
       "//third_party/fuchsia-sdk/sdk/pkg/fidl_cpp",
     ]
     sources += [ "base/network_change_notifier_fuchsia_unittest.cc" ]
+    use_cfv2 = false
     additional_manifest_fragments =
         [ "//build/config/fuchsia/test/network_capabilities.test-cmx" ]
   }

diff --git a/services/BUILD.gn b/services/BUILD.gn
@@ -87,6 +87,7 @@ test("services_unittests") {
   if (is_fuchsia) {
     # Enable the test HTTP server for use by NetworkServiceTestWithService.*
     use_test_server = true
+    use_cfv2 = false
     additional_manifest_fragments = [
       # TODO(crbug.com/1185811): Figure out why jit_capabilities is needed.
       "//build/config/fuchsia/test/jit_capabilities.test-cmx",

diff --git a/skia/BUILD.gn b/skia/BUILD.gn
@@ -942,6 +942,10 @@ test("skia_unittests") {
   }
 
   if (is_fuchsia) {
+    # TODO(https://crbug.com/1287051): fuchsia.sys.Launcher is used to launch
+    # fuchsia-pkg://fuchsia.com/fonts#meta/fonts.cmx with specific test
+    # args.
+    use_cfv2 = false
     sources += [ "ext/fontmgr_fuchsia_unittest.cc" ]
     deps += [
       "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.fonts",

diff --git a/testing/test.gni b/testing/test.gni
@@ -53,6 +53,8 @@ if (is_android) {
 #   use_native_activity: Test implements ANativeActivity_onCreate().
 #   use_cfv2: (Fuchsia, optional): build the test as a framework v2 component;
 #      see https://fuchsia.dev/fuchsia-src/concepts/components/v2 for details.
+#      The default value is true; set it to false explicitly to build a test as
+#      a v1 component.
 #   is_xctest: (iOS, optional) whether to build the executable as XCTest.
 #      Similar to the GN arg 'enable_run_ios_unittests_with_xctest' but
 #      for build targets.
@@ -336,7 +338,7 @@ template("test") {
     _pkg_target = "${_output_name}_pkg"
     _exec_target = "${_output_name}__exec"
 
-    if (defined(invoker.use_cfv2) && invoker.use_cfv2) {
+    if (!defined(invoker.use_cfv2) || invoker.use_cfv2) {
       # Generate a CML fragment that provides the program name.
       _test_program_fragment_target = "${target_name}_program-fragment"
       _test_program_fragment =

diff --git a/third_party/blink/common/BUILD.gn b/third_party/blink/common/BUILD.gn
@@ -297,6 +297,7 @@ test("blink_common_unittests") {
   }
 
   if (is_fuchsia) {
+    use_cfv2 = false
     additional_manifest_fragments = [
       # TODO(crbug.com/1185811): Figure out why jit_capabilities is needed.
       "//build/config/fuchsia/test/jit_capabilities.test-cmx",

diff --git a/third_party/blink/renderer/controller/BUILD.gn b/third_party/blink/renderer/controller/BUILD.gn
@@ -149,6 +149,7 @@ test("blink_unittests") {
   }
 
   if (is_fuchsia) {
+    use_cfv2 = false
     additional_manifest_fragments = [
       "//build/config/fuchsia/test/font_capabilities.test-cmx",
 

diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn
@@ -1956,6 +1956,7 @@ test("blink_platform_unittests") {
   if (is_fuchsia) {
     # Oilpan reuses V8's v8::PageAllocator which generally requires JIT
     # permissions.
+    use_cfv2 = false
     additional_manifest_fragments =
         [ "//build/config/fuchsia/test/jit_capabilities.test-cmx" ]
   }

diff --git a/third_party/blink/renderer/platform/heap/BUILD.gn b/third_party/blink/renderer/platform/heap/BUILD.gn
@@ -126,6 +126,8 @@ test("blink_heap_unittests") {
   }
 
   if (is_fuchsia) {
+    use_cfv2 = false
+
     # Oilpan reuses V8's v8::PageAllocator which generally requires JIT
     # permissions.
     additional_manifest_fragments =
@@ -188,6 +190,8 @@ test("blink_heap_perftests") {
   }
 
   if (is_fuchsia) {
+    use_cfv2 = false
+
     # Oilpan reuses V8's v8::PageAllocator which generally requires JIT
     # permissions.
     additional_manifest_fragments =

diff --git a/third_party/boringssl/BUILD.gn b/third_party/boringssl/BUILD.gn
@@ -184,6 +184,7 @@ if (build_with_chromium) {
     deps += [ "//base/test:test_support" ]
 
     if (is_fuchsia) {
+      use_cfv2 = false
       additional_manifest_fragments =
           [ "//build/config/fuchsia/test/network_capabilities.test-cmx" ]
     }

diff --git a/ui/aura/BUILD.gn b/ui/aura/BUILD.gn
@@ -345,6 +345,7 @@ test("aura_unittests") {
   }
 
   if (is_fuchsia) {
+    use_cfv2 = false
     additional_manifest_fragments =
         [ "//build/config/fuchsia/test/present_view_capabilities.test-cmx" ]
   }

diff --git a/ui/compositor/BUILD.gn b/ui/compositor/BUILD.gn
@@ -263,6 +263,7 @@ test("compositor_unittests") {
   }
 
   if (is_fuchsia) {
+    use_cfv2 = false
     additional_manifest_fragments = [
       # TODO(crbug.com/1185811): Figure out why jit_capabilities is needed.
       "//build/config/fuchsia/test/jit_capabilities.test-cmx",

diff --git a/ui/gfx/BUILD.gn b/ui/gfx/BUILD.gn
@@ -908,6 +908,10 @@ test("gfx_unittests") {
   }
 
   if (is_fuchsia) {
+    # TODO(https://crbug.com/1287051): fuchsia.sys.Launcher is used to launch
+    # fuchsia-pkg://fuchsia.com/fonts#meta/fonts.cmx with specific test
+    # args.
+    use_cfv2 = false
     deps += [ "//skia:test_fonts" ]
   }
 }

diff --git a/ui/message_center/BUILD.gn b/ui/message_center/BUILD.gn
@@ -227,6 +227,7 @@ if (enable_message_center) {
     }
 
     if (is_fuchsia) {
+      use_cfv2 = false
       additional_manifest_fragments = [
         "//build/config/fuchsia/test/font_capabilities.test-cmx",
         "//build/config/fuchsia/test/present_view_capabilities.test-cmx",

diff --git a/ui/snapshot/BUILD.gn b/ui/snapshot/BUILD.gn
@@ -121,6 +121,7 @@ test("snapshot_unittests") {
   }
 
   if (is_fuchsia) {
+    use_cfv2 = false
     additional_manifest_fragments = [
       # TODO(crbug.com/1185811): Figure out why jit_capabilities is needed.
       "//build/config/fuchsia/test/jit_capabilities.test-cmx",

diff --git a/ui/views/BUILD.gn b/ui/views/BUILD.gn
@@ -1290,6 +1290,7 @@ test("views_unittests") {
   }
 
   if (is_fuchsia) {
+    use_cfv2 = false
     additional_manifest_fragments = [
       "//build/config/fuchsia/test/font_capabilities.test-cmx",
 

diff --git a/ui/views/examples/BUILD.gn b/ui/views/examples/BUILD.gn
@@ -325,6 +325,7 @@ test("views_examples_unittests") {
   }
 
   if (is_fuchsia) {
+    use_cfv2 = false
     additional_manifest_fragments =
         [ "//build/config/fuchsia/test/vulkan_capabilities.test-cmx" ]
   }

diff --git a/ui/wm/BUILD.gn b/ui/wm/BUILD.gn
@@ -171,6 +171,7 @@ test("wm_unittests") {
   }
 
   if (is_fuchsia) {
+    use_cfv2 = false
     additional_manifest_fragments =
         [ "//build/config/fuchsia/test/present_view_capabilities.test-cmx" ]
   }