Revert "[vm/wasm] Boilerplate for package:wasm"

This reverts commit 2bafc32.

Reason for revert: Build failures on Flutter HHH CI bots and golem (Dart VM ARMv8, Flutter).

Original change's description:
> [vm/wasm] Boilerplate for package:wasm
> 
> So far this just builds the wasmer library, copies it into the sdk
> directory, loads the library, and allows you to compile WASM modules.
> You can't actually do anything with the modules yet.
> 
> Bug: #37882
> Change-Id: I7d7cfe5721bbe38a6afe76f326518e714d236ed4
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/158367
> Commit-Queue: Liam Appelbe <[email protected]>
> Reviewed-by: Ryan Macnak <[email protected]>

[email protected],[email protected],[email protected]

Change-Id: I2c5b390987bf45704a3de98e050f4bcf1cb235d8
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: #37882
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/159243
Reviewed-by: Tess Strickland <[email protected]>
Commit-Queue: Tess Strickland <[email protected]>

Author: sstrickl

.dart_tool/package_config.json

@@ -11,7 +11,7 @@
     "constraint, update this by running tools/generate_package_config.dart."
   ],
   "configVersion": 2,
-  "generated": "2020-08-18T11:26:08.472483",
+  "generated": "2020-08-17T14:05:33.104579",
   "generator": "tools/generate_package_config.dart",
   "packages": [
     {
@@ -515,7 +515,7 @@
       "name": "shelf",
       "rootUri": "../third_party/pkg/shelf",
       "packageUri": "lib/",
-      "languageVersion": "2.1"
+      "languageVersion": "2.0"
     },
     {
       "name": "shelf_packages_handler",
@@ -715,12 +715,6 @@
       "packageUri": "lib/",
       "languageVersion": "2.8"
     },
-    {
-      "name": "wasm",
-      "rootUri": "../pkg/wasm",
-      "packageUri": "lib/",
-      "languageVersion": "2.6"
-    },
     {
       "name": "watcher",
       "rootUri": "../third_party/pkg/watcher",

.packages

@@ -116,7 +116,6 @@ vector_math:third_party/pkg/vector_math/lib
 vm:pkg/vm/lib
 vm_service:pkg/vm_service/lib
 vm_snapshot_analysis:pkg/vm_snapshot_analysis/lib
-wasm:pkg/wasm/lib
 watcher:third_party/pkg/watcher/lib
 webdriver:third_party/pkg/webdriver/lib
 web_components:third_party/pkg/web_components/lib

DEPS

@@ -133,7 +133,7 @@ vars = {
   "quiver-dart_tag": "246e754fe45cecb6aa5f3f13b4ed61037ff0d784",
   "resource_rev": "f8e37558a1c4f54550aa463b88a6a831e3e33cd6",
   "root_certificates_rev": "16ef64be64c7dfdff2b9f4b910726e635ccc519e",
-  "rust_revision": "cbe7c5ce705896d4e22bf6096590bc1f17993b78",
+  "rust_revision": "60960a260f7b5c695fd0717311d72ce62dd4eb43",
   "shelf_static_rev": "v0.2.8",
   "shelf_packages_handler_tag": "2.0.0",
   "shelf_proxy_tag": "0.1.0+7",

build/rust/rust.gni

@@ -8,95 +8,34 @@ template("rust_library") {
     manifest = invoker.manifest
   }
 
-  debug = defined(invoker.debug) && invoker.debug
-  shared = defined(invoker.shared) && invoker.shared
-
   cmd = [
-    rebase_path("//buildtools/${host_os}-${host_cpu}/rust/bin/cargo"),
+    rebase_path("//buildtools/${current_os}-${current_cpu}/rust/bin/cargo"),
     "build",
     "--target-dir",
     rebase_path(target_out_dir),
     "--manifest-path",
     manifest,
   ]
+  output = "$target_out_dir/lib${invoker.lib_name}.a"
+  debug = defined(invoker.debug) && invoker.debug
 
-  # For cross compilation, figure out the target triple. You can get a full list
-  # of the targets that rust supports like this: rustc --print target-list
-  cargo_out_dir = target_out_dir
-  if (is_linux) {
-    rust_os = "unknown-linux-gnu"
-  } else if (is_mac) {
-    rust_os = "apple-darwin"
-  } else if (is_win) {
-    rust_os = "pc-windows-gnu"
-  } else if (is_android) {
-    rust_os = "linux-android"
-  } else if (is_fuchsia) {
-    rust_os = "fuchsia"
-  }
-  if (defined(rust_os)) {
-    if (current_cpu == "x86") {
-      rust_target = "i686-${rust_os}"
-    } else if (current_cpu == "x64") {
-      rust_target = "x86_64-${rust_os}"
-    } else if (current_cpu == "arm") {
-      rust_target = "arm-${rust_os}eabi"
-    } else if (current_cpu == "arm64") {
-      rust_target = "aarch64-${rust_os}"
-    }
-  }
-  if (defined(rust_target)) {
-    cmd += [
-      "--target",
-      rust_target,
-    ]
-    cargo_out_dir += "/${rust_target}"
-  }
-
-  if (debug) {
-    cargo_out_dir += "/debug"
-  } else {
-    cargo_out_dir += "/release"
+  if (!debug) {
     cmd += [ "--release" ]
   }
 
-  output_file = ""
-  if (shared) {
-    if (is_win) {
-      output_file = "${invoker.lib_name}.dll"
-    } else if (is_mac) {
-      output_file = "lib${invoker.lib_name}.dylib"
-    } else {
-      output_file = "lib${invoker.lib_name}.so"
-    }
-  } else {
-    if (is_win) {
-      output_file = "${invoker.lib_name}.lib"
-    }else {
-      output_file = "lib${invoker.lib_name}.a"
-    }
-  }
-
-  action("${target_name}_cargo") {
+  action(target_name) {
     script = "//build/rust/run.py"
     args = cmd
-    outputs = [ "${cargo_out_dir}/${output_file}" ]
+    outputs = [ output ]
     public_configs = [ ":${target_name}_config" ]
   }
 
-  config("${target_name}_cargo_config") {
-    if (!shared) {
-      libs = [ invoker.lib_name ]
-      lib_dirs = [ out_dir ]
+  config("${target_name}_config") {
+    libs = [ "wasmer" ]
+    if (debug) {
+      lib_dirs = [ "$target_out_dir/debug" ]
+    } else {
+      lib_dirs = [ "$target_out_dir/release" ]
     }
   }
-
-  # Cargo leaves the library in cargo_out_dir, which varies based on the target.
-  # So we need to copy it to target_out_dir to make it easier for dependees to
-  # locate the library.
-  copy(target_name) {
-    deps = [ ":${target_name}_cargo" ]
-    sources = [ "${cargo_out_dir}/${output_file}" ]
-    outputs = [ "${target_out_dir}/${output_file}" ]
-  }
 }

pkg/wasm/.gitignore

@@ -221,6 +221,10 @@ library_for_all_configs("libdart") {
     ":generate_version_cc_file",
     "third_party/double-conversion/src:libdouble_conversion",
   ]
+  if (dart_enable_wasm) {
+    extra_deps += [ "//third_party/wasmer" ]
+    defines = [ "DART_ENABLE_WASM" ]
+  }
   if (is_fuchsia) {
     if (using_fuchsia_gn_sdk) {
       extra_deps += [

pkg/wasm/AUTHORS

@@ -90,6 +90,9 @@ declare_args() {
 
   # Whether libdart should export the symbols of the Dart API.
   dart_lib_export_symbols = true
+
+  # Whether dart:wasm should be enabled.
+  dart_enable_wasm = false
 }
 
 declare_args() {

pkg/wasm/LICENSE

@@ -156,6 +156,9 @@ library_for_all_configs("libdart_lib") {
       ]
     }
   }
+  if (dart_enable_wasm) {
+    defines = [ "DART_ENABLE_WASM" ]
+  }
   include_dirs = [ ".." ]
   allsources = async_runtime_cc_files + collection_runtime_cc_files +
                core_runtime_cc_files + developer_runtime_cc_files +