[fuchsia] Sandbox Flutter runner (flutter#4410)

eligt · Dec 4, 2017 · b5d0a4a · b5d0a4a
1 parent 3e84bf0
commit b5d0a4a
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 21 deletions.
diff --git a/BUILD.gn b/BUILD.gn
@@ -23,8 +23,8 @@ group("flutter") {
 
   if (is_fuchsia) {
     public_deps += [
-      "$flutter_root/content_handler",
-      "$flutter_root/content_handler:aot_content_handler",
+      "$flutter_root/content_handler:aot",
+      "$flutter_root/content_handler:jit",
       "$flutter_root/examples",
       "$flutter_root/flow",
     ]
@@ -62,25 +62,32 @@ config("config") {
 if (is_fuchsia) {
   import("//build/package.gni")
 
-  package("package") {
-    system_image = true
-    testonly = true
+  package("flutter_aot_runner") {
+    deps = [
+      "$flutter_root/content_handler:aot",
+    ]
+
+    binary = "flutter_aot_runner"
 
-    package_name = "flutter"
+    meta = [ {
+      path = rebase_path("content_handler/meta/sandbox")
+      dest = "sandbox"
+    } ]
+  }
 
+  package("flutter_jit_runner") {
     deps = [
-      ":flutter",
+      "$flutter_root/content_handler:jit",
     ]
 
-    binaries = [
-      {
-        name = "flutter_jit_runner"
-      },
-      {
-        name = "flutter_aot_runner"
-      },
-    ]
+    binary = "flutter_jit_runner"
+
+    meta = [ {
+      path = rebase_path("content_handler/meta/sandbox")
+      dest = "sandbox"
+    } ]
   }
+
 } else {
   group("dist") {
     testonly = true

diff --git a/content_handler/BUILD.gn b/content_handler/BUILD.gn
@@ -86,12 +86,12 @@ template("flutter_content_handler") {
   }
 }
 
-flutter_content_handler("content_handler") {
-  output_name = "flutter_jit_runner"
-  extra_deps = [ "//third_party/dart/runtime:libdart_jit" ]
-}
-
-flutter_content_handler("aot_content_handler") {
+flutter_content_handler("aot") {
   output_name = "flutter_aot_runner"
   extra_deps = [ "//third_party/dart/runtime:libdart_precompiled_runtime" ]
 }
+
+flutter_content_handler("jit") {
+  output_name = "flutter_jit_runner"
+  extra_deps = [ "//third_party/dart/runtime:libdart_jit" ]
+}
diff --git a/content_handler/meta/sandbox b/content_handler/meta/sandbox
@@ -0,0 +1,7 @@
+{
+    "features": [
+        "root-ssl-certificates",
+        "system-temp",
+        "vulkan"
+    ]
+}
diff --git a/travis/licenses_golden/licenses_flutter b/travis/licenses_golden/licenses_flutter
@@ -1256,6 +1256,7 @@ LIBRARY: engine
 ORIGIN: ../../../LICENSE
 TYPE: LicenseType.bsd
 FILE: ../../../flutter/DEPS
+FILE: ../../../flutter/content_handler/meta/sandbox
 FILE: ../../../flutter/frontend_server/.packages
 FILE: ../../../flutter/frontend_server/bin/starter.dart
 FILE: ../../../flutter/frontend_server/lib/server.dart