Move simplechrome's runtime deps to the chromiumos_preflight target.

And add two mojo libs that were added to the list of required runtime
deps in:
https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1066085

Change-Id: I0e2d90ba922508f2f22802780944100e8c17b17e
Reviewed-on: https://chromium-review.googlesource.com/1072490
Commit-Queue: Ben Pastene <bpastene@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568961}

BUILD.gn

@@ -843,6 +843,24 @@ if (is_chromeos) {
         "//media/gpu:video_encode_accelerator_unittest",
       ]
     }
+
+    # The following run-time dependencies are needed to deploy chrome to a
+    # ChromeOS device. See the link for the full list:
+    # https://codesearch.chromium.org/chromium/src/third_party/chromite/lib/chrome_util.py?l=341
+    # Most of these are copy targets, for which GN doesn't add their outputs
+    # as runtime-deps. See the link below for more details:
+    # https://chromium.googlesource.com/chromium/src/+/master/tools/gn/docs/reference.md#actions-and-copies
+    data_deps = [
+      "//chrome:xdg_mime",
+      "//mojo/edk:mojo_core_arc32",
+      "//mojo/edk:mojo_core_arc64",
+    ]
+
+    # TODO(bpastene): Figure out what's generating resources/chromeos/ and
+    # declare it as a dep instead of adding the dir directly.
+    data = [
+      "$root_out_dir/resources/chromeos/",
+    ]
   }
 }
 

DEPS

@@ -518,7 +518,7 @@ deps = {
 
   # Build tools for Chrome OS. Note: This depends on third_party/pyelftools.
   'src/third_party/chromite': {
-      'url': Var('chromium_git') + '/chromiumos/chromite.git' + '@' + '2ac4352aea1751d8e928d3e4db519ba9a73a22a9',
+      'url': Var('chromium_git') + '/chromiumos/chromite.git' + '@' + '29f54a30992a4837e08c30d9ccdd7eb1855d0365',
       'condition': 'checkout_linux',
   },
 

chromeos/BUILD.gn

@@ -829,17 +829,6 @@ if (cros_board != "") {
       "//:chromiumos_preflight",  # Builds the browser.
       ":cros_vm_sanity_test_wrapper",  # Builds the test wrapper.
     ]
-
-    # The following dependencies are needed to deploy chrome to the VM. See the
-    # link for the full list:
-    # https://codesearch.chromium.org/chromium/src/third_party/chromite/lib/chrome_util.py?l=341
-    data_deps += [ "//chrome:xdg_mime" ]
-
-    # TODO(bpastene): Figure out what's generating resources/chromeos/ and
-    # declare it as a dep instead of adding the dir directly.
-    data = [
-      "$root_out_dir/resources/chromeos/",
-    ]
   }
 }