Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions shell/platform/fuchsia/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ group("fuchsia") {
deps = [
":dart_binaries",
":flutter_binaries",
"dart-pkg",
"dart_runner:dart_aot_${product_suffix}runner",
"dart_runner:dart_jit_${product_suffix}runner",
"flutter:flutter_aot_${product_suffix}runner",
Expand Down
7 changes: 7 additions & 0 deletions shell/platform/fuchsia/dart-pkg/BUILD.gn
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Copyright 2013 The Flutter Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

group("dart-pkg") {
deps = [ "zircon:dart_zircon" ]
}
16 changes: 16 additions & 0 deletions shell/platform/fuchsia/dart-pkg/zircon/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# found in the LICENSE file.

import("//build/fuchsia/sdk.gni")
import("//flutter/tools/fuchsia/dart/dart_library.gni")

config("zircon_config") {
include_dirs = [ "." ]
Expand Down Expand Up @@ -35,3 +36,18 @@ source_set("zircon") {
"//flutter/third_party/tonic",
]
}

dart_library("dart_zircon") {
package_name = "zircon"

sources = [
"src/handle.dart",
"src/handle_disposition.dart",
"src/handle_waiter.dart",
"src/init.dart",
"src/system.dart",
"zircon.dart",
]

deps = [ "../zircon_ffi:dart_zircon_ffi" ]
}
7 changes: 7 additions & 0 deletions shell/platform/fuchsia/dart-pkg/zircon_ffi/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# found in the LICENSE file.

import("//build/fuchsia/sdk.gni")
import("//flutter/tools/fuchsia/dart/dart_library.gni")

config("zircon_ffi_config") {
include_dirs = [ "." ]
Expand All @@ -21,3 +22,9 @@ shared_library("zircon_ffi") {
"//third_party/dart/runtime:dart_api",
]
}

dart_library("dart_zircon_ffi") {
package_name = "zircon_ffi"

sources = [ "zircon_ffi.dart" ]
}
4 changes: 4 additions & 0 deletions tools/.vpython
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
wheel: <
name: "infra/python/wheels/pyyaml/${vpython_platform}"
version: "version:3.12"
>
5 changes: 5 additions & 0 deletions tools/.vpython3
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
python_version: "3.8"
wheel: <
name: "infra/python/wheels/pyyaml-py3"
version: "version:5.3.1"
>
4 changes: 1 addition & 3 deletions tools/fuchsia/dart/dart_package_config.gni
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,7 @@ template("dart_package_config") {
"visibility",
])

script =
get_label_info("//flutter/tools/fuchsia/dart:gen_dart_package_config",
"target_out_dir") + "/gen_dart_package_config.pyz"
script = "//flutter/tools/fuchsia/dart/gen_dart_package_config.py"

inputs = [ intermediate_file ]
outputs = [ package_config_file ]
Expand Down
2 changes: 1 addition & 1 deletion tools/fuchsia/dart/gen_dart_package_config.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python3.8
#!/usr/bin/env vpython3
# Copyright 2013 The Flutter Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
Expand Down
2 changes: 1 addition & 1 deletion tools/fuchsia/sdk/find_dart_libraries.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python3
#!/usr/bin/env vpython3
#
# Copyright 2013 The Flutter Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
Expand Down
2 changes: 1 addition & 1 deletion tools/gn
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python3
#!/usr/bin/env vpython3
# Copyright 2013 The Flutter Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
Expand Down
6 changes: 3 additions & 3 deletions tools/python/run_python3_action.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#!/usr/bin/env python
#!/usr/bin/env vpython3
#
# Copyright 2021 The Flutter Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

import os
import sys
import subprocess

os.execv('/usr/bin/python3', ['python3'] + sys.argv[1:])
subprocess.run(['vpython3'] + sys.argv[1:])