Update Fuchsia integration tests to use subpackaged runners (#186172) This commit removes the "oot_" prefixed dart/flutter runners (e.g. "oot_dart_jit_runner") and switches to using the regular runners (e.g. "dart_jit_runner) as a subpackage in the integration tests. The benefit of this is that the runners are fully embedded in the integration test's package, and won't override the fuchsia.com packages in the base image.

diff --git a/engine/src/flutter/shell/platform/fuchsia/dart_runner/BUILD.gn b/engine/src/flutter/shell/platform/fuchsia/dart_runner/BUILD.gn
index 94c0854..489c52a 100644
--- a/engine/src/flutter/shell/platform/fuchsia/dart_runner/BUILD.gn
+++ b/engine/src/flutter/shell/platform/fuchsia/dart_runner/BUILD.gn

@@ -276,20 +276,6 @@
   product = true
 }
 
-# "OOT" copy of the runner used by tests, to avoid conflicting with the runner
-# in the base fuchsia image.
-# TODO(fxbug.dev/106575): Fix this with subpackages.
-aot_runner_package("oot_dart_aot_runner") {
-  product = false
-}
-
-# "OOT" copy of the runner used by tests, to avoid conflicting with the runner
-# in the base fuchsia image.
-# TODO(fxbug.dev/106575): Fix this with subpackages.
-jit_runner_package("oot_dart_jit_runner") {
-  product = false
-}
-
 if (enable_unittests) {
   runner_sources("jit_runner_sources_for_test") {
     product = false

diff --git a/engine/src/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/BUILD.gn b/engine/src/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/BUILD.gn
index e1df73b..0ebfc39 100644
--- a/engine/src/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/BUILD.gn
+++ b/engine/src/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/BUILD.gn

@@ -40,4 +40,6 @@
 
 fuchsia_test_archive("dart-aot-runner-integration-test") {
   deps = [ ":dart-aot-runner-integration-test-bin" ]
+  subpackages =
+      [ "//flutter/shell/platform/fuchsia/dart_runner:dart_aot_runner" ]
 }

diff --git a/engine/src/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/README.md b/engine/src/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/README.md
index d931273..b8ea7c5 100644
--- a/engine/src/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/README.md
+++ b/engine/src/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/README.md

@@ -22,8 +22,6 @@
 ```
 $FUCHSIA_DIR/.jiri_root/bin/ffx repository publish $FUCHSIA_DIR/$(cat $FUCHSIA_DIR/.fx-build-dir)/amber-files --package-archive $ENGINE_DIR/out/fuchsia_profile_x64/dart-aot-runner-integration-test-0.far
 
-$FUCHSIA_DIR/.jiri_root/bin/ffx repository publish $FUCHSIA_DIR/$(cat $FUCHSIA_DIR/.fx-build-dir)/amber-files --package-archive $ENGINE_DIR/out/fuchsia_profile_x64/oot_dart_aot_runner-0.far
-
 $FUCHSIA_DIR/.jiri_root/bin/ffx repository publish $FUCHSIA_DIR/$(cat $FUCHSIA_DIR/.fx-build-dir)/amber-files --package-archive $ENGINE_DIR/out/fuchsia_profile_x64/gen/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_echo_server/dart_aot_echo_server/dart_aot_echo_server.far
 ```
 

diff --git a/engine/src/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/dart-aot-runner-integration-test.cc b/engine/src/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/dart-aot-runner-integration-test.cc
index 0d721e7..b28bd33 100644
--- a/engine/src/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/dart-aot-runner-integration-test.cc
+++ b/engine/src/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/dart-aot-runner-integration-test.cc

@@ -29,9 +29,7 @@
 
 constexpr auto kDartAotRunner = "dart_aot_runner";
 constexpr auto kDartAotRunnerRef = ChildRef{kDartAotRunner};
-constexpr auto kDartAotRunnerUrl =
-    "fuchsia-pkg://fuchsia.com/oot_dart_aot_runner#meta/"
-    "dart_aot_runner.cm";
+constexpr auto kDartAotRunnerUrl = "dart_aot_runner#meta/dart_aot_runner.cm";
 
 constexpr auto kDartAotEchoServer = "dart_aot_echo_server";
 constexpr auto kDartAotEchoServerRef = ChildRef{kDartAotEchoServer};

diff --git a/engine/src/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/meta/dart-aot-runner-integration-test.cml b/engine/src/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/meta/dart-aot-runner-integration-test.cml
index 3c312d0..5753788 100644
--- a/engine/src/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/meta/dart-aot-runner-integration-test.cml
+++ b/engine/src/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/meta/dart-aot-runner-integration-test.cml

@@ -46,7 +46,6 @@
             "deprecated-allowed-packages": [
                 "dart_aot_echo_server",
                 "test_manager",
-                "oot_dart_aot_runner"
             ],
         },
     },

diff --git a/engine/src/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_echo_server/BUILD.gn b/engine/src/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_echo_server/BUILD.gn
index 245bdb7..19364e9 100644
--- a/engine/src/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_echo_server/BUILD.gn
+++ b/engine/src/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_echo_server/BUILD.gn

@@ -42,26 +42,12 @@
   testonly = true
 
   package_name = "dart_aot_echo_server"
-  deps = [
-    ":aot_component",
-
-    # "OOT" copy of the runner used by tests, to avoid conflicting with the
-    # runners in the base fuchsia image.
-    # TODO(fxbug.dev/106575): Fix this with subpackages.
-    "//flutter/shell/platform/fuchsia/dart_runner:oot_dart_aot_runner",
-  ]
+  deps = [ ":aot_component" ]
 }
 
 fuchsia_package("jit_echo_package") {
   testonly = true
 
   package_name = "dart_jit_echo_server"
-  deps = [
-    ":jit_component",
-
-    # "OOT" copy of the runner used by tests, to avoid conflicting with the
-    # runners in the base fuchsia image.
-    # TODO(fxbug.dev/106575): Fix this with subpackages.
-    "//flutter/shell/platform/fuchsia/dart_runner:oot_dart_jit_runner",
-  ]
+  deps = [ ":jit_component" ]
 }

diff --git a/engine/src/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/BUILD.gn b/engine/src/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/BUILD.gn
index 675753e..938424a 100644
--- a/engine/src/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/BUILD.gn
+++ b/engine/src/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/BUILD.gn

@@ -40,4 +40,6 @@
 
 fuchsia_test_archive("dart-jit-runner-integration-test") {
   deps = [ ":dart-jit-runner-integration-test-bin" ]
+  subpackages =
+      [ "//flutter/shell/platform/fuchsia/dart_runner:dart_jit_runner" ]
 }

diff --git a/engine/src/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/README.md b/engine/src/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/README.md
index 08789da..b02ebc1 100644
--- a/engine/src/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/README.md
+++ b/engine/src/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/README.md

@@ -22,8 +22,6 @@
 ```
 $FUCHSIA_DIR/.jiri_root/bin/ffx repository publish $FUCHSIA_DIR/$(cat $FUCHSIA_DIR/.fx-build-dir)/amber-files --package-archive $ENGINE_DIR/out/fuchsia_debug_x64/dart-jit-runner-integration-test-0.far
 
-$FUCHSIA_DIR/.jiri_root/bin/ffx repository publish $FUCHSIA_DIR/$(cat $FUCHSIA_DIR/.fx-build-dir)/amber-files --package-archive $ENGINE_DIR/out/fuchsia_debug_x64/oot_dart_jit_runner-0.far
-
 $FUCHSIA_DIR/.jiri_root/bin/ffx repository publish $FUCHSIA_DIR/$(cat $FUCHSIA_DIR/.fx-build-dir)/amber-files --package-archive $ENGINE_DIR/out/fuchsia_debug_x64/gen/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_echo_server/dart_jit_echo_server/dart_jit_echo_server.far
 ```
 

diff --git a/engine/src/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/dart-jit-runner-integration-test.cc b/engine/src/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/dart-jit-runner-integration-test.cc
index 8341efb..96538c7 100644
--- a/engine/src/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/dart-jit-runner-integration-test.cc
+++ b/engine/src/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/dart-jit-runner-integration-test.cc

@@ -29,9 +29,7 @@
 
 constexpr auto kDartJitRunner = "dart_jit_runner";
 constexpr auto kDartJitRunnerRef = ChildRef{kDartJitRunner};
-constexpr auto kDartJitRunnerUrl =
-    "fuchsia-pkg://fuchsia.com/oot_dart_jit_runner#meta/"
-    "dart_jit_runner.cm";
+constexpr auto kDartJitRunnerUrl = "dart_jit_runner#meta/dart_jit_runner.cm";
 
 constexpr auto kDartJitEchoServer = "dart_jit_echo_server";
 constexpr auto kDartJitEchoServerRef = ChildRef{kDartJitEchoServer};

diff --git a/engine/src/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/meta/dart-jit-runner-integration-test.cml b/engine/src/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/meta/dart-jit-runner-integration-test.cml
index 97ba46a..272f2dc 100644
--- a/engine/src/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/meta/dart-jit-runner-integration-test.cml
+++ b/engine/src/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/meta/dart-jit-runner-integration-test.cml

@@ -50,8 +50,7 @@
         "fuchsia.test": {
             "deprecated-allowed-packages": [
                 "dart_jit_echo_server",
-                "test_manager",
-                "oot_dart_jit_runner"
+                "test_manager"
             ],
         },
     },

diff --git a/engine/src/flutter/shell/platform/fuchsia/flutter/BUILD.gn b/engine/src/flutter/shell/platform/fuchsia/flutter/BUILD.gn
index e1ec279..d4a0522 100644
--- a/engine/src/flutter/shell/platform/fuchsia/flutter/BUILD.gn
+++ b/engine/src/flutter/shell/platform/fuchsia/flutter/BUILD.gn

@@ -438,34 +438,6 @@
   product = true
 }
 
-# "OOT" copy of the runner used by tests, to avoid conflicting with the runner
-# in the base fuchsia image.
-# TODO(fxbug.dev/106575): Fix this with subpackages.
-aot_runner("oot_flutter_aot_runner") {
-  product = false
-}
-
-# "OOT" copy of the runner used by tests, to avoid conflicting with the runner
-# in the base fuchsia image.
-# TODO(fxbug.dev/106575): Fix this with subpackages.
-aot_runner("oot_flutter_aot_product_runner") {
-  product = true
-}
-
-# "OOT" copy of the runner used by tests, to avoid conflicting with the runner
-# in the base fuchsia image.
-# TODO(fxbug.dev/106575): Fix this with subpackages.
-jit_runner("oot_flutter_jit_runner") {
-  product = false
-}
-
-# "OOT" copy of the runner used by tests, to avoid conflicting with the runner
-# in the base fuchsia image.
-# TODO(fxbug.dev/106575): Fix this with subpackages.
-jit_runner("oot_flutter_jit_product_runner") {
-  product = true
-}
-
 test_fixtures("flutter_runner_fixtures") {
   fixtures = []
 }

diff --git a/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/embedder/BUILD.gn b/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/embedder/BUILD.gn
index a4e6afb..0069494 100644
--- a/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/embedder/BUILD.gn
+++ b/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/embedder/BUILD.gn

@@ -54,10 +54,11 @@
     ":flutter-embedder-test-bin",
     "child-view:package",
     "parent-view:package",
-
-    # "OOT" copies of the runners used by tests, to avoid conflicting with the
-    # runners in the base fuchsia image.
-    # TODO(fxbug.dev/106575): Fix this with subpackages.
-    "//flutter/shell/platform/fuchsia/flutter:oot_flutter_jit_runner",
+  ]
+  subpackages = [
+    "//flutter/shell/platform/fuchsia/flutter:flutter_jit_runner",
+    "//flutter/shell/platform/fuchsia/flutter:flutter_jit_product_runner",
+    "//flutter/shell/platform/fuchsia/flutter:flutter_aot_runner",
+    "//flutter/shell/platform/fuchsia/flutter:flutter_aot_product_runner",
   ]
 }

diff --git a/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/embedder/flutter-embedder-test.cc b/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/embedder/flutter-embedder-test.cc
index 976518a..0dbf210 100644
--- a/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/embedder/flutter-embedder-test.cc
+++ b/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/embedder/flutter-embedder-test.cc

@@ -52,17 +52,13 @@
 constexpr auto kVulkanLoaderServiceName = "fuchsia.vulkan.loader.Loader";
 
 constexpr auto kFlutterJitRunnerUrl =
-    "fuchsia-pkg://fuchsia.com/oot_flutter_jit_runner#meta/"
-    "flutter_jit_runner.cm";
+    "flutter_jit_runner#meta/flutter_jit_runner.cm";
 constexpr auto kFlutterJitProductRunnerUrl =
-    "fuchsia-pkg://fuchsia.com/oot_flutter_jit_product_runner#meta/"
-    "flutter_jit_product_runner.cm";
+    "flutter_jit_product_runner#meta/flutter_jit_product_runner.cm";
 constexpr auto kFlutterAotRunnerUrl =
-    "fuchsia-pkg://fuchsia.com/oot_flutter_aot_runner#meta/"
-    "flutter_aot_runner.cm";
+    "flutter_aot_runner#meta/flutter_aot_runner.cm";
 constexpr auto kFlutterAotProductRunnerUrl =
-    "fuchsia-pkg://fuchsia.com/oot_flutter_aot_product_runner#meta/"
-    "flutter_aot_product_runner.cm";
+    "flutter_aot_product_runner#meta/flutter_aot_product_runner.cm";
 constexpr char kChildViewUrl[] =
     "fuchsia-pkg://fuchsia.com/child-view#meta/child-view.cm";
 constexpr char kParentViewUrl[] =

diff --git a/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/embedder/meta/flutter-embedder-test.cml b/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/embedder/meta/flutter-embedder-test.cml
index 06a5178..610c8e5 100644
--- a/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/embedder/meta/flutter-embedder-test.cml
+++ b/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/embedder/meta/flutter-embedder-test.cml

@@ -38,10 +38,6 @@
             "deprecated-allowed-packages": [
                 "child-view",
                 "flatland-scene-manager-test-ui-stack",
-                "oot_flutter_aot_runner",
-                "oot_flutter_jit_runner",
-                "oot_flutter_jit_product_runner",
-                "oot_flutter_aot_product_runner",
                 "parent-view",
                 "test-ui-stack",
                 "test_manager",

diff --git a/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/mouse-input/BUILD.gn b/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/mouse-input/BUILD.gn
index 62697f2..970eded 100644
--- a/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/mouse-input/BUILD.gn
+++ b/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/mouse-input/BUILD.gn

@@ -54,12 +54,7 @@
 }
 
 fuchsia_test_archive("mouse-input-test") {
-  deps = [
-    ":mouse-input-test-bin",
-
-    # "OOT" copies of the runners used by tests, to avoid conflicting with the
-    # runners in the base fuchsia image.
-    # TODO(fxbug.dev/106575): Fix this with subpackages.
-    "//flutter/shell/platform/fuchsia/flutter:oot_flutter_jit_runner",
-  ]
+  deps = [ ":mouse-input-test-bin" ]
+  subpackages =
+      [ "//flutter/shell/platform/fuchsia/flutter:flutter_jit_runner" ]
 }

diff --git a/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/mouse-input/meta/mouse-input-test.cml b/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/mouse-input/meta/mouse-input-test.cml
index 59981c2..b8bc2d9 100644
--- a/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/mouse-input/meta/mouse-input-test.cml
+++ b/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/mouse-input/meta/mouse-input-test.cml

@@ -71,10 +71,6 @@
                 "cursor",
                 "flatland-scene-manager-test-ui-stack",
                 "mouse-input-view",
-                "oot_flutter_aot_runner",
-                "oot_flutter_jit_runner",
-                "oot_flutter_jit_product_runner",
-                "oot_flutter_aot_product_runner",
                 "test_manager",
                 "test-ui-stack",
             ],

diff --git a/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/text-input/BUILD.gn b/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/text-input/BUILD.gn
index 64d5c21..05a1919 100644
--- a/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/text-input/BUILD.gn
+++ b/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/text-input/BUILD.gn

@@ -51,12 +51,7 @@
 }
 
 fuchsia_test_archive("text-input-test") {
-  deps = [
-    ":text-input-test-bin",
-
-    # "OOT" copies of the runners used by tests, to avoid conflicting with the
-    # runners in the base fuchsia image.
-    # TODO(fxbug.dev/106575): Fix this with subpackages.
-    "//flutter/shell/platform/fuchsia/flutter:oot_flutter_jit_runner",
-  ]
+  deps = [ ":text-input-test-bin" ]
+  subpackages =
+      [ "//flutter/shell/platform/fuchsia/flutter:flutter_jit_runner" ]
 }

diff --git a/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/text-input/meta/text-input-test.cml b/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/text-input/meta/text-input-test.cml
index 08b83d2..956ae5a 100644
--- a/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/text-input/meta/text-input-test.cml
+++ b/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/text-input/meta/text-input-test.cml

@@ -71,10 +71,6 @@
                 "cursor",
                 "flatland-scene-manager-test-ui-stack",
                 "test-ui-stack",
-                "oot_flutter_aot_runner",
-                "oot_flutter_jit_runner",
-                "oot_flutter_jit_product_runner",
-                "oot_flutter_aot_product_runner",
                 "test_manager",
                 "text-input-view",
             ],

diff --git a/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/touch-input/BUILD.gn b/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/touch-input/BUILD.gn
index 51aaae4..c982bd4 100644
--- a/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/touch-input/BUILD.gn
+++ b/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/touch-input/BUILD.gn

@@ -55,12 +55,7 @@
 }
 
 fuchsia_test_archive("touch-input-test") {
-  deps = [
-    ":touch-input-test-bin",
-
-    # "OOT" copies of the runners used by tests, to avoid conflicting with the
-    # runners in the base fuchsia image.
-    # TODO(fxbug.dev/106575): Fix this with subpackages.
-    "//flutter/shell/platform/fuchsia/flutter:oot_flutter_jit_runner",
-  ]
+  deps = [ ":touch-input-test-bin" ]
+  subpackages =
+      [ "//flutter/shell/platform/fuchsia/flutter:flutter_jit_runner" ]
 }

diff --git a/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/touch-input/meta/touch-input-test.cml b/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/touch-input/meta/touch-input-test.cml
index 8ad2368..7fc74dc 100644
--- a/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/touch-input/meta/touch-input-test.cml
+++ b/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/touch-input/meta/touch-input-test.cml

@@ -61,10 +61,6 @@
             "deprecated-allowed-packages": [
                 "embedding-flutter-view",
                 "flatland-scene-manager-test-ui-stack",
-                "oot_flutter_aot_runner",
-                "oot_flutter_jit_runner",
-                "oot_flutter_jit_product_runner",
-                "oot_flutter_aot_product_runner",
                 "test_manager",
                 "touch-input-view",
             ],

diff --git a/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/utils/portable_ui_test.h b/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/utils/portable_ui_test.h
index 62b5417..0078b3f 100644
--- a/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/utils/portable_ui_test.h
+++ b/engine/src/flutter/shell/platform/fuchsia/flutter/tests/integration/utils/portable_ui_test.h

@@ -40,8 +40,7 @@
   static constexpr auto kFlutterJitRunnerRef =
       component_testing::ChildRef{kFlutterJitRunner};
   static constexpr auto kFlutterJitRunnerUrl =
-      "fuchsia-pkg://fuchsia.com/oot_flutter_jit_runner#meta/"
-      "flutter_jit_runner.cm";
+      "flutter_jit_runner#meta/flutter_jit_runner.cm";
   static constexpr auto kFlutterRunnerEnvironment = "flutter_runner_env";
 
   void SetUp(bool build_realm = true);

diff --git a/engine/src/flutter/testing/fuchsia/test_suites.yaml b/engine/src/flutter/testing/fuchsia/test_suites.yaml
index d7ef7e5..27bb248 100644
--- a/engine/src/flutter/testing/fuchsia/test_suites.yaml
+++ b/engine/src/flutter/testing/fuchsia/test_suites.yaml

@@ -15,7 +15,6 @@
   package: common_cpp_unittests-0.far
 - test_command: test run fuchsia-pkg://fuchsia.com/dart-aot-runner-integration-test#meta/dart-aot-runner-integration-test.cm
   packages:
-    - oot_dart_aot_runner-0.far
     - dart-aot-runner-integration-test-0.far
     - gen/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_echo_server/dart_aot_echo_server/dart_aot_echo_server.far
   emulator_arch:
@@ -24,7 +23,6 @@
   variant: profile
 - test_command: test run fuchsia-pkg://fuchsia.com/dart-jit-runner-integration-test#meta/dart-jit-runner-integration-test.cm
   packages:
-    - oot_dart_jit_runner-0.far
     - dart-jit-runner-integration-test-0.far
     - gen/flutter/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_echo_server/dart_jit_echo_server/dart_jit_echo_server.far
   emulator_arch:
@@ -55,7 +53,6 @@
 - test_command: test run fuchsia-pkg://fuchsia.com/flutter-embedder-test#meta/flutter-embedder-test.cm
   packages:
     - flutter-embedder-test-0.far
-    - oot_flutter_jit_runner-0.far
     - gen/flutter/shell/platform/fuchsia/flutter/tests/integration/embedder/child-view/child-view/child-view.far
     - gen/flutter/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/parent-view/parent-view.far
   variant: debug_x64
@@ -70,7 +67,6 @@
 - test_command: test run fuchsia-pkg://fuchsia.com/mouse-input-test#meta/mouse-input-test.cm
   packages:
     - mouse-input-test-0.far
-    - oot_flutter_jit_runner-0.far
     - gen/flutter/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/mouse-input-view/mouse-input-view.far
 - test_command: test run fuchsia-pkg://fuchsia.com/no_dart_plugin_registrant_unittests#meta/no_dart_plugin_registrant_unittests.cm
   package: no_dart_plugin_registrant_unittests-0.far
@@ -86,7 +82,6 @@
 - test_command: test run fuchsia-pkg://fuchsia.com/text-input-test#meta/text-input-test.cm
   packages:
     - text-input-test-0.far
-    - oot_flutter_jit_runner-0.far
     - gen/flutter/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/text-input-view/text-input-view.far
   variant: debug_x64
 - test_command: test run fuchsia-pkg://fuchsia.com/tonic_unittests#meta/tonic_unittests.cm
@@ -96,7 +91,6 @@
 - test_command: test run fuchsia-pkg://fuchsia.com/touch-input-test#meta/touch-input-test.cm
   packages:
     - touch-input-test-0.far
-    - oot_flutter_jit_runner-0.far
     - gen/flutter/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/touch-input-view/touch-input-view.far
     - gen/flutter/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/embedding-flutter-view/embedding-flutter-view.far
   variant: debug_x64

diff --git a/engine/src/flutter/tools/fuchsia/devshell/run_integration_test.sh b/engine/src/flutter/tools/fuchsia/devshell/run_integration_test.sh
index a56a9c6..af46114 100755
--- a/engine/src/flutter/tools/fuchsia/devshell/run_integration_test.sh
+++ b/engine/src/flutter/tools/fuchsia/devshell/run_integration_test.sh

@@ -46,8 +46,6 @@
 # Ensure we know about the test and look up its packages.
 # The first package listed here should be the main package for the test
 # (the package that gets passed to `ffx test run`).
-# Note: You do not need to include oot_flutter_jit_runner-0.far, the script
-# automatically publishes it.
 test_packages=
 case $test_name in
   embedder)
@@ -179,7 +177,7 @@
   "$jiri_bin"/fx build
 fi
 
-test_package_paths=( "$fuchsia_out_dir"/oot_flutter_jit_runner-0.far )
+test_package_paths=()
 for test_package in "${test_packages[@]}"
 do
   test_package_paths+=( $(find "$fuchsia_out_dir" -name "$test_package") )

diff --git a/engine/src/flutter/tools/fuchsia/fuchsia_archive.gni b/engine/src/flutter/tools/fuchsia/fuchsia_archive.gni
index 353840c..79a868a 100644
--- a/engine/src/flutter/tools/fuchsia/fuchsia_archive.gni
+++ b/engine/src/flutter/tools/fuchsia/fuchsia_archive.gni

@@ -86,7 +86,11 @@
   _package_target = target_name + "__package"
   _package_name = target_name
   fuchsia_package(_package_target) {
-    forward_variables_from(invoker, [ "testonly" ])
+    forward_variables_from(invoker,
+                           [
+                             "subpackages",
+                             "testonly",
+                           ])
     package_name = _package_name
     deps = [ ":$_component_target" ]
   }
@@ -159,6 +163,7 @@
                              "binary",
                              "libraries",
                              "resources",
+                             "subpackages",
                            ])
     testonly = true
     if (defined(_cml_file)) {