Version 2.12.0-259.1.beta

Merge '2.12.0-259.0.dev' into beta

Author: athomas

.dart_tool/package_config.json

@@ -1,6 +1,6 @@
 {
   "copyright": [
-    "Copyright (c) 2020, the Dart project authors. Please see the AUTHORS ",
+    "Copyright (c) 2021, the Dart project authors. Please see the AUTHORS ",
     "file for details. All rights reserved. Use of this source code is ",
     "governed by a BSD-style license that can be found in the LICENSE file."
   ],
@@ -11,14 +11,14 @@
     "constraint, update this by running tools/generate_package_config.dart."
   ],
   "configVersion": 2,
-  "generated": "2020-12-03T14:26:48.568312",
+  "generated": "2021-01-16T20:34:15.774260",
   "generator": "tools/generate_package_config.dart",
   "packages": [
     {
       "name": "_fe_analyzer_shared",
       "rootUri": "../pkg/_fe_analyzer_shared",
       "packageUri": "lib/",
-      "languageVersion": "2.6"
+      "languageVersion": "2.12"
     },
     {
       "name": "_fe_analyzer_shared_assigned_variables",
@@ -95,7 +95,7 @@
       "name": "analyzer_utilities",
       "rootUri": "../pkg/analyzer_utilities",
       "packageUri": "lib/",
-      "languageVersion": "2.1"
+      "languageVersion": "2.12"
     },
     {
       "name": "args",
@@ -273,7 +273,7 @@
       "name": "front_end",
       "rootUri": "../pkg/front_end",
       "packageUri": "lib/",
-      "languageVersion": "2.6"
+      "languageVersion": "2.12"
     },
     {
       "name": "front_end_testcases",
@@ -296,7 +296,7 @@
       "name": "html",
       "rootUri": "../third_party/pkg/html",
       "packageUri": "lib/",
-      "languageVersion": "2.3"
+      "languageVersion": "2.8"
     },
     {
       "name": "http",
@@ -354,8 +354,9 @@
     },
     {
       "name": "js_runtime",
-      "rootUri": "../sdk/lib/_internal/js_runtime",
-      "packageUri": "lib/"
+      "rootUri": "../pkg/js_runtime",
+      "packageUri": "lib/",
+      "languageVersion": "2.12"
     },
     {
       "name": "json_rpc_2",
@@ -367,7 +368,7 @@
       "name": "kernel",
       "rootUri": "../pkg/kernel",
       "packageUri": "lib/",
-      "languageVersion": "2.6"
+      "languageVersion": "2.12"
     },
     {
       "name": "language_versioning_2.7_test",
@@ -396,7 +397,7 @@
       "name": "matcher",
       "rootUri": "../third_party/pkg/matcher",
       "packageUri": "lib/",
-      "languageVersion": "2.10"
+      "languageVersion": "2.12"
     },
     {
       "name": "meta",
@@ -408,7 +409,7 @@
       "name": "mime",
       "rootUri": "../third_party/pkg/mime",
       "packageUri": "lib/",
-      "languageVersion": "2.0"
+      "languageVersion": "2.12"
     },
     {
       "name": "mockito",
@@ -472,7 +473,7 @@
       "name": "package_config",
       "rootUri": "../third_party/pkg_tested/package_config",
       "packageUri": "lib/",
-      "languageVersion": "2.7"
+      "languageVersion": "2.12"
     },
     {
       "name": "package_deps",
@@ -632,7 +633,7 @@
       "name": "sync_http",
       "rootUri": "../third_party/pkg/sync_http",
       "packageUri": "lib/",
-      "languageVersion": "2.0"
+      "languageVersion": "2.12"
     },
     {
       "name": "telemetry",
@@ -680,7 +681,7 @@
       "name": "test_reflective_loader",
       "rootUri": "../third_party/pkg/test_reflective_loader",
       "packageUri": "lib/",
-      "languageVersion": "1.8"
+      "languageVersion": "2.12"
     },
     {
       "name": "test_runner",
@@ -722,7 +723,7 @@
       "name": "vm_service",
       "rootUri": "../pkg/vm_service",
       "packageUri": "lib/",
-      "languageVersion": "2.6"
+      "languageVersion": "2.12"
     },
     {
       "name": "vm_snapshot_analysis",
@@ -740,7 +741,7 @@
       "name": "watcher",
       "rootUri": "../third_party/pkg/watcher",
       "packageUri": "lib/",
-      "languageVersion": "2.2"
+      "languageVersion": "2.12"
     },
     {
       "name": "web_components",

.packages

@@ -54,7 +54,7 @@ http_throttle:third_party/pkg/http_throttle/lib
 intl:third_party/pkg/intl/lib
 js:pkg/js/lib
 js_ast:pkg/js_ast/lib
-js_runtime:sdk/lib/_internal/js_runtime/lib
+js_runtime:pkg/js_runtime/lib
 json_rpc_2:third_party/pkg/json_rpc_2/lib
 kernel:pkg/kernel/lib
 linter:third_party/pkg/linter/lib

BUILD.gn

@@ -159,16 +159,64 @@ if (is_fuchsia) {
   import("third_party/fuchsia/sdk/linux/build/component.gni")
   import("third_party/fuchsia/sdk/linux/build/package.gni")
 
-  fuchsia_component("fuchsia_test_component") {
-    testonly = true
-    data_deps = [ "runtime/bin:dart" ]
-    manifest = "build/fuchsia/dart.cmx"
+  template("dart_fuchsia_test_package") {
+    fuchsia_package(target_name) {
+      package_name = invoker.package_name
+      if (is_debug) {
+        package_name += "_debug"
+      } else if (is_release) {
+        package_name += "_release"
+      } else if (is_product) {
+        package_name += "_product"
+      }
+      testonly = true
+      deps = invoker.deps
+    }
+  }
 
-    resource_files = [
-      ".dart_tool/package_config.json",
-      "pkg/testing/test/hello_test.dart",
-      "tools/addlatexhash.dart",
-    ]
+  template("dart_fuchsia_test_component") {
+    fuchsia_component(target_name) {
+      testonly = true
+      data_deps = [ "runtime/bin:dart" ]
+      if (defined(invoker.data_deps)) {
+        data_deps += invoker.data_deps
+      }
+      manifest = "build/fuchsia/dart.cmx"
+
+      library_files = []
+      if (defined(invoker.library_files)) {
+        library_files += invoker.library_files
+      }
+      resource_files = [
+        ".dart_tool/package_config.json",
+        "pkg/testing/test/hello_test.dart",
+        "tools/addlatexhash.dart",
+      ]
+      resource_dirs = invoker.resource_dirs
+
+      resources = []
+      foreach(file, library_files) {
+        resources += [
+          {
+            path = root_out_dir + "/" + file
+            dest = "lib/" + file
+          },
+        ]
+      }
+      foreach(file, resource_files) {
+        resources += [
+          {
+            path = file
+            dest = "data/" + file
+          },
+        ]
+      }
+      resources +=
+          exec_script("tools/fuchsia/find_resources.py", resource_dirs, "json")
+    }
+  }
+
+  dart_fuchsia_test_component("fuchsia_test_component") {
     resource_dirs = [
       "tests/standalone_2",
       "pkg/async_helper",
@@ -190,30 +238,32 @@ if (is_fuchsia) {
       "third_party/pkg/string_scanner",
       "third_party/pkg/typed_data",
     ]
-
-    resources = []
-    foreach(file, resource_files) {
-      resources += [
-        {
-          path = file
-          dest = "data/" + file
-        },
-      ]
-    }
-    resources +=
-        exec_script("tools/fuchsia/find_resources.py", resource_dirs, "json")
   }
 
-  fuchsia_package("fuchsia_test_package") {
-    package_name = "dart_test_"
-    if (is_debug) {
-      package_name += "debug"
-    } else if (is_release) {
-      package_name += "release"
-    } else if (is_product) {
-      package_name += "product"
-    }
-    testonly = true
+  dart_fuchsia_test_package("fuchsia_test_package") {
+    package_name = "dart_test"
     deps = [ ":fuchsia_test_component" ]
   }
+
+  dart_fuchsia_test_component("fuchsia_ffi_test_component") {
+    data_deps = [
+      "runtime/bin:ffi_test_dynamic_library",
+      "runtime/bin:ffi_test_functions",
+    ]
+    library_files = [
+      "libffi_test_dynamic_library.so",
+      "libffi_test_functions.so",
+    ]
+    resource_dirs = [
+      "pkg/expect",
+      "pkg/meta",
+      "tests/ffi",
+      "third_party/pkg/ffi",
+    ]
+  }
+
+  dart_fuchsia_test_package("fuchsia_ffi_test_package") {
+    package_name = "dart_ffi_test"
+    deps = [ ":fuchsia_ffi_test_component" ]
+  }
 }