Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 3019109

Browse files
authored
Revert "[fuchsia] Remove component framework v1 support. (#39732)" (#40104)
This reverts commit 24e69c8.
1 parent 811dcfb commit 3019109

17 files changed

+1093
-2
lines changed

ci/licenses_golden/excluded_files

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,7 @@
275275
../../../flutter/shell/platform/fuchsia/flutter/accessibility_bridge_unittest.cc
276276
../../../flutter/shell/platform/fuchsia/flutter/build/asset_package.py
277277
../../../flutter/shell/platform/fuchsia/flutter/build/gen_debug_wrapper_main.py
278+
../../../flutter/shell/platform/fuchsia/flutter/component_v1_unittest.cc
278279
../../../flutter/shell/platform/fuchsia/flutter/component_v2_unittest.cc
279280
../../../flutter/shell/platform/fuchsia/flutter/focus_delegate_unittests.cc
280281
../../../flutter/shell/platform/fuchsia/flutter/fuchsia_intl_unittest.cc

ci/licenses_golden/licenses_flutter

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2744,6 +2744,8 @@ ORIGIN: ../../../flutter/shell/platform/fuchsia/dart_runner/service_isolate.h +
27442744
ORIGIN: ../../../flutter/shell/platform/fuchsia/dart_runner/vmservice/empty.dart + ../../../flutter/LICENSE
27452745
ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/accessibility_bridge.cc + ../../../flutter/LICENSE
27462746
ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/accessibility_bridge.h + ../../../flutter/LICENSE
2747+
ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/component_v1.cc + ../../../flutter/LICENSE
2748+
ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/component_v1.h + ../../../flutter/LICENSE
27472749
ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/component_v2.cc + ../../../flutter/LICENSE
27482750
ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/component_v2.h + ../../../flutter/LICENSE
27492751
ORIGIN: ../../../flutter/shell/platform/fuchsia/flutter/engine.cc + ../../../flutter/LICENSE
@@ -5293,6 +5295,8 @@ FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/service_isolate.h
52935295
FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/vmservice/empty.dart
52945296
FILE: ../../../flutter/shell/platform/fuchsia/flutter/accessibility_bridge.cc
52955297
FILE: ../../../flutter/shell/platform/fuchsia/flutter/accessibility_bridge.h
5298+
FILE: ../../../flutter/shell/platform/fuchsia/flutter/component_v1.cc
5299+
FILE: ../../../flutter/shell/platform/fuchsia/flutter/component_v1.h
52965300
FILE: ../../../flutter/shell/platform/fuchsia/flutter/component_v2.cc
52975301
FILE: ../../../flutter/shell/platform/fuchsia/flutter/component_v2.h
52985302
FILE: ../../../flutter/shell/platform/fuchsia/flutter/engine.cc
@@ -5325,11 +5329,19 @@ FILE: ../../../flutter/shell/platform/fuchsia/flutter/keyboard.cc
53255329
FILE: ../../../flutter/shell/platform/fuchsia/flutter/keyboard.h
53265330
FILE: ../../../flutter/shell/platform/fuchsia/flutter/logging.h
53275331
FILE: ../../../flutter/shell/platform/fuchsia/flutter/main.cc
5332+
FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/aot_product_runtime
5333+
FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/aot_runtime
53285334
FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/common.shard.cml
53295335
FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/flutter_aot_product_runner.cml
5336+
FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/flutter_aot_product_runner.cmx
53305337
FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/flutter_aot_runner.cml
5338+
FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/flutter_aot_runner.cmx
53315339
FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/flutter_jit_product_runner.cml
5340+
FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/flutter_jit_product_runner.cmx
53325341
FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/flutter_jit_runner.cml
5342+
FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/flutter_jit_runner.cmx
5343+
FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/jit_product_runtime
5344+
FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/jit_runtime
53335345
FILE: ../../../flutter/shell/platform/fuchsia/flutter/platform_view.cc
53345346
FILE: ../../../flutter/shell/platform/fuchsia/flutter/platform_view.h
53355347
FILE: ../../../flutter/shell/platform/fuchsia/flutter/pointer_delegate.cc

shell/platform/fuchsia/flutter/BUILD.gn

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ template("runner_sources") {
5757
sources = [
5858
"accessibility_bridge.cc",
5959
"accessibility_bridge.h",
60+
"component_v1.cc",
61+
"component_v1.h",
6062
"component_v2.cc",
6163
"component_v2.h",
6264
"engine.cc",
@@ -320,6 +322,7 @@ template("jit_runner") {
320322

321323
binary = "flutter_jit${product_suffix}_runner"
322324

325+
cmx_file = rebase_path("meta/flutter_jit${product_suffix}_runner.cmx")
323326
cml_file = rebase_path("meta/flutter_jit${product_suffix}_runner.cml")
324327

325328
resources = [
@@ -399,6 +402,7 @@ template("aot_runner") {
399402
]
400403
}
401404

405+
cmx_file = rebase_path("meta/flutter_aot${product_suffix}_runner.cmx")
402406
cml_file = rebase_path("meta/flutter_aot${product_suffix}_runner.cml")
403407

404408
binary = "flutter_aot${product_suffix}_runner"
@@ -496,6 +500,7 @@ if (enable_unittests) {
496500

497501
sources = [
498502
"accessibility_bridge_unittest.cc",
503+
"component_v1_unittest.cc",
499504
"component_v2_unittest.cc",
500505
"flutter_runner_fakes.h",
501506
"focus_delegate_unittests.cc",

0 commit comments

Comments
 (0)