Skip to content

Commit

Permalink
Roll dart to aece1c1. (flutter#12997)
Browse files Browse the repository at this point in the history
* Roll dart to aece1c1.

Changes since last roll:
```
aece1c1 Update compile_flutter.sh after vm -> frontend_server rename
9293e26 [gardening] Fix flutter hhh patch.
13fbf56 [flutter] split frontend_server from vm package
a389015 Rewrite MethodInvocation to FunctionExpressionInvocation when the target is not a method.
ae25175 [vm,aot,bytecode] Performance fixes
01ebf92 [VM] Consume extension member/is late flag setting when reading kernel file.
8e05cd2 [vm, bytecode] Emit bytecode without ASTs by default.
4539536 [eventhandler] generalize socket initialization
7115687 NNBD i13n: Add a description for discarding just the condition
2bcaf02 (origin/base) Update dartdoc to 0.28.7.
a0e8c77 [dart2js] New RTI: Prevent elision of precomputed1 and remove unneeded read.
c38e19c [vm/compiler] bit utilities
f918214 Add a unit test reproducing issue flutter#38352.
ad47b1c Remove summary1, part 2.
0881a4a Reland "Deprecate TypeParameterTypeImpl.getTypes()"
d93a6b5 Prepare to publish analyzer version 0.38.5
d5feab0 [vm] Create builds for LeakSanitizer, MemorySanitizer and ThreadSanitizer.
8c5236f [vm/ffi] Fix host-target word mismatch breaking AOT callbacks in ARM_X64.
5f7b837 Remove unused FunctionElementImpl_forLUB.
2c75771 Write and read the static type of IntegerLiteral.
b00453c Create synthetic FunctionType in quick fixes.
897e197 Flow analysis: Update AssignedVariablesVisitor to track functions/methods.
55466fd Flow analysis: Remove AssignedVariables.capturedAnywhere.
0a5cf36 Make exitFunctionBody safer.
```

* Update license hash
  • Loading branch information
aam authored Oct 8, 2019
1 parent f309a06 commit 034a630
Show file tree
Hide file tree
Showing 14 changed files with 85 additions and 76 deletions.
2 changes: 1 addition & 1 deletion BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ group("flutter") {
if (!is_fuchsia && !is_fuchsia_host) {
if (current_toolchain == host_toolchain) {
public_deps += [
"$flutter_root/frontend_server",
"$flutter_root/flutter_frontend_server:frontend_server",
"//third_party/dart:create_sdk",
]

Expand Down
4 changes: 2 additions & 2 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ vars = {
# Dart is: https://github.com/dart-lang/sdk/blob/master/DEPS.
# You can use //tools/dart/create_updated_flutter_deps.py to produce
# updated revision list of existing dependencies.
'dart_revision': '8ba6f7e2eb8ac44b6de3e87a3062d1c8e34b6cc1',
'dart_revision': 'aece1c1e927341c1c9b6517cc7d668974280de98',

# WARNING: DO NOT EDIT MANUALLY
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
Expand Down Expand Up @@ -230,7 +230,7 @@ deps = {
Var('dart_git') + '/dart2js_info.git' + '@' + Var('dart_dart2js_info_tag'),

'src/third_party/dart/third_party/pkg/dartdoc':
Var('dart_git') + '/[email protected].6',
Var('dart_git') + '/[email protected].7',

'src/third_party/dart/third_party/pkg/fixnum':
Var('dart_git') + '/fixnum.git' + '@' + Var('dart_fixnum_tag'),
Expand Down
6 changes: 3 additions & 3 deletions ci/analyze.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ if [ -n "$RESULTS" ]; then
exit 1;
fi

echo "Analyzing frontend_server..."
echo "Analyzing flutter_frontend_server..."
RESULTS=`dartanalyzer \
--packages=flutter/frontend_server/.packages \
--packages=flutter/flutter_frontend_server/.packages \
--options flutter/analysis_options.yaml \
flutter/frontend_server \
flutter/flutter_frontend_server \
2>&1 \
| grep -Ev "No issues found!" \
| grep -Ev "Analyzing.+frontend_server"`
Expand Down
2 changes: 2 additions & 0 deletions ci/licenses_golden/licenses_flutter
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ FILE: ../../../flutter/flow/texture.cc
FILE: ../../../flutter/flow/texture.h
FILE: ../../../flutter/flow/view_holder.cc
FILE: ../../../flutter/flow/view_holder.h
FILE: ../../../flutter/flutter_frontend_server/bin/starter.dart
FILE: ../../../flutter/flutter_frontend_server/lib/server.dart
FILE: ../../../flutter/fml/base32.cc
FILE: ../../../flutter/fml/base32.h
FILE: ../../../flutter/fml/base32_unittest.cc
Expand Down
2 changes: 1 addition & 1 deletion ci/licenses_golden/licenses_third_party
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: b89d744fc043b99a65199c97e3813e5e
Signature: 25e2b30226f59acec59cad73d452e693

UNUSED LICENSES:

Expand Down
File renamed without changes.
63 changes: 63 additions & 0 deletions flutter_frontend_server/BUILD.gn
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
# 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.

if (!is_fuchsia_host && !is_fuchsia) {
import("//third_party/dart/utils/application_snapshot.gni")

frontend_server_files =
exec_script("//third_party/dart/tools/list_dart_files.py",
[
"absolute",
rebase_path("."),
],
"list lines")

frontend_server_files +=
exec_script("//third_party/dart/tools/list_dart_files.py",
[
"absolute",
rebase_path("../../third_party/dart/pkg"),
],
"list lines")

application_snapshot("frontend_server") {
main_dart = "bin/starter.dart"
deps = [
":package_incremental_compiler",
"$flutter_root/lib/snapshot:kernel_platform_files",
]
dot_packages = rebase_path(".packages")
flutter_patched_sdk = rebase_path("$root_out_dir/flutter_patched_sdk")
training_args = [
"--train",
"--sdk-root=$flutter_patched_sdk",
rebase_path(main_dart),
]

inputs = frontend_server_files
}

# For flutter/flutter#36738 we make the source files available so that
# we can generate a local frontend_server snapshot in the tools cache.
action("package_incremental_compiler") {
script = "$flutter_root/flutter_frontend_server/package_incremental.py"

inputs = frontend_server_files

outputs = [
"$root_gen_dir/dart-pkg/frontend_server/pubspec.yaml",
"$root_gen_dir/dart-pkg/vm/pubspec.yaml",
"$root_gen_dir/dart-pkg/build_integration/pubspec.yaml",
"$root_gen_dir/dart-pkg/front_end/pubspec.yaml",
"$root_gen_dir/dart-pkg/kernel/pubspec.yaml",
"$root_gen_dir/dart-pkg/dev_compiler/pubspec.yaml",
]

args = [
"--input-root=" + rebase_path("//third_party/dart/pkg"),
"--output-root=" + rebase_path("$root_gen_dir/dart-pkg"),
"--frontend-server=" + rebase_path("$flutter_root"),
]
}
}
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ library frontend_server;

import 'dart:io';

import 'package:frontend_server/server.dart';
import 'package:flutter_frontend_server/server.dart';

void main(List<String> args) async {
final int exitCode = await starter(args);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import 'package:args/args.dart';
import 'package:path/path.dart' as path;

import 'package:vm/incremental_compiler.dart';
import 'package:vm/frontend_server.dart' as frontend
import 'package:frontend_server/frontend_server.dart' as frontend
show
FrontendCompiler,
CompilerInterface,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"kernel",
"front_end",
"dev_compiler",
"frontend_server",
"flutter_frontend_server",
]

VM_PUBSPEC = r'''name: vm
Expand All @@ -41,7 +41,7 @@
meta: any
'''

FRONTEND_SERVER_PUBSPEC = r'''name: frontend_server
FLUTTER_FRONTEND_SERVER_PUBSPEC = r'''name: flutter_frontend_server
version: 0.0.1
environment:
sdk: ">=2.2.2 <3.0.0"
Expand Down Expand Up @@ -87,7 +87,7 @@
PUBSPECS = {
'vm': VM_PUBSPEC,
'build_integration': BUILD_INTEGRATION_PUBSPEC,
'frontend_server': FRONTEND_SERVER_PUBSPEC,
'flutter_frontend_server': FLUTTER_FRONTEND_SERVER_PUBSPEC,
'kernel': KERNEL_PUBSPEC,
'front_end': FRONT_END_PUBSPEC,
'dev_compiler': DEV_COMPILER_PUBSPEC,
Expand All @@ -103,7 +103,7 @@ def main():
for package in PACKAGES:
base = args.input
# Handle different path for frontend_server
if package == 'frontend_server':
if package == 'flutter_frontend_server':
base = args.frontend
package_root = os.path.join(base, package)
for root, directories, files in os.walk(package_root):
Expand Down
File renamed without changes.
68 changes: 6 additions & 62 deletions frontend_server/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ if (is_fuchsia_host || is_fuchsia) {
import("//build/dart/dart_library.gni")
import("//build/dart/dart_tool.gni")

dart_library("frontend_server") {
dart_library("flutter_frontend_server") {
disable_analysis = true
package_name = "frontend_server"
package_name = "flutter_frontend_server"

sources = [
"server.dart",
Expand All @@ -19,6 +19,7 @@ if (is_fuchsia_host || is_fuchsia) {
"//third_party/dart-pkg/pub/path",
"//third_party/dart-pkg/pub/usage",
"//third_party/dart/pkg/build_integration",
"//third_party/dart/pkg/frontend_server",
"//third_party/dart/pkg/front_end",
"//third_party/dart/pkg/kernel",
"//third_party/dart/pkg/vm",
Expand All @@ -27,72 +28,15 @@ if (is_fuchsia_host || is_fuchsia) {

dart_tool("frontend_server_tool") {
main_dart = "bin/starter.dart"
source_dir = "."
source_dir = "../flutter_frontend_server"
disable_analysis = true
output_name = "frontend_server"

sources = []

deps = [
":frontend_server",
]
}
} else {
import("//third_party/dart/utils/application_snapshot.gni")

frontend_server_files =
exec_script("//third_party/dart/tools/list_dart_files.py",
[
"absolute",
rebase_path("."),
],
"list lines")

frontend_server_files +=
exec_script("//third_party/dart/tools/list_dart_files.py",
[
"absolute",
rebase_path("../../third_party/dart/pkg"),
],
"list lines")

application_snapshot("frontend_server") {
main_dart = "bin/starter.dart"
deps = [
":package_incremental_compiler",
"$flutter_root/lib/snapshot:kernel_platform_files",
]
dot_packages = rebase_path(".packages")
flutter_patched_sdk = rebase_path("$root_out_dir/flutter_patched_sdk")
training_args = [
"--train",
"--sdk-root=$flutter_patched_sdk",
rebase_path(main_dart),
]

inputs = frontend_server_files
}

# For flutter/flutter#36738 we make the source files available so that
# we can generate a local frontend_server snapshot in the tools cache.
action("package_incremental_compiler") {
script = "$flutter_root/frontend_server/package_incremental.py"

inputs = frontend_server_files

outputs = [
"$root_gen_dir/dart-pkg/frontend_server/pubspec.yaml",
"$root_gen_dir/dart-pkg/vm/pubspec.yaml",
"$root_gen_dir/dart-pkg/build_integration/pubspec.yaml",
"$root_gen_dir/dart-pkg/front_end/pubspec.yaml",
"$root_gen_dir/dart-pkg/kernel/pubspec.yaml",
"$root_gen_dir/dart-pkg/dev_compiler/pubspec.yaml",
]

args = [
"--input-root=" + rebase_path("//third_party/dart/pkg"),
"--output-root=" + rebase_path("$root_gen_dir/dart-pkg"),
"--frontend-server=" + rebase_path("$flutter_root"),
":flutter_frontend_server",
]
}
}

2 changes: 1 addition & 1 deletion tools/generate_package_files.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import shutil

ALL_PACKAGES = {
'frontend_server': [],
'flutter_frontend_server': [],
}

SRC_DIR = os.getcwd()
Expand Down

0 comments on commit 034a630

Please sign in to comment.