Revert "Build dart:zircon and dart:zircon_ffi (#28071)" (flutter/engine#28313)

This reverts commit 1e9b7aed566105eec982ca0eb545139b218bc916.

Reverting in order to land revert of the gn script_executable from
python3 to vpython3, which is causing flakes on Windows.

Issue: https://github.com/flutter/flutter/issues/88719
This commit is contained in:
Chris Bracken 2021-08-26 11:21:49 -07:00 committed by GitHub
parent 36dd0da0d9
commit 8f87951759
11 changed files with 9 additions and 47 deletions

View File

@ -77,7 +77,6 @@ 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",

View File

@ -1,7 +0,0 @@
# 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" ]
}

View File

@ -3,7 +3,6 @@
# found in the LICENSE file.
import("//build/fuchsia/sdk.gni")
import("//flutter/tools/fuchsia/dart/dart_library.gni")
config("zircon_config") {
include_dirs = [ "." ]
@ -36,18 +35,3 @@ 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" ]
}

View File

@ -3,7 +3,6 @@
# found in the LICENSE file.
import("//build/fuchsia/sdk.gni")
import("//flutter/tools/fuchsia/dart/dart_library.gni")
config("zircon_ffi_config") {
include_dirs = [ "." ]
@ -32,9 +31,3 @@ shared_library("zircon_ffi") {
"//third_party/dart/runtime:dart_api",
]
}
dart_library("dart_zircon_ffi") {
package_name = "zircon_ffi"
sources = [ "zircon_ffi.dart" ]
}

View File

@ -1,4 +0,0 @@
wheel: <
name: "infra/python/wheels/pyyaml/${vpython_platform}"
version: "version:3.12"
>

View File

@ -1,5 +0,0 @@
python_version: "3.8"
wheel: <
name: "infra/python/wheels/pyyaml-py3"
version: "version:5.3.1"
>

View File

@ -77,7 +77,9 @@ template("dart_package_config") {
"visibility",
])
script = "//flutter/tools/fuchsia/dart/gen_dart_package_config.py"
script =
get_label_info("//flutter/tools/fuchsia/dart:gen_dart_package_config",
"target_out_dir") + "/gen_dart_package_config.pyz"
inputs = [ intermediate_file ]
outputs = [ package_config_file ]

View File

@ -1,4 +1,4 @@
#!/usr/bin/env vpython3
#!/usr/bin/env python3.8
# 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.

View File

@ -1,4 +1,4 @@
#!/usr/bin/env vpython3
#!/usr/bin/env python3
#
# Copyright 2013 The Flutter Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be

View File

@ -1,4 +1,4 @@
#!/usr/bin/env vpython3
#!/usr/bin/env python3
# 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.

View File

@ -1,10 +1,10 @@
#!/usr/bin/env vpython3
#!/usr/bin/env python
#
# 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
subprocess.run(['vpython3'] + sys.argv[1:])
os.execv('/usr/bin/python3', ['python3'] + sys.argv[1:])