mandoline: Reland "Fix ICU initialization".

mojo/runner/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//mojo/generate_mojo_shell_assets_list.gni")
 import("//mojo/public/mojo_application.gni")
 import("//testing/test.gni")
 import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
 
 group("runner") {
@@ skipping 34 matching lines @@
   if (!is_android) {
     sources += [
       "desktop/launcher_process.cc",
       "desktop/launcher_process.h",
       "desktop/main.cc",
       "register_local_aliases.cc",
       "register_local_aliases.h",
     ]
     deps += [
       "//components/tracing:startup_tracing",
-      "//mojo/shell",
+      "//third_party/icu:icudata",
     ]
   } else {
     sources += [
       "android/context_init.h",
       "android/library_loader.cc",
       "android/main.cc",
       "android/main.h",
     ]
 
     deps += [
@@ skipping 33 matching lines @@
 
 source_set("init") {
   sources = [
     "init.cc",
     "init.h",
   ]
 
   deps = [
     "//mojo/runner/host:switches",
     "//base",
+    "//base:i18n",
   ]
 }
 
 source_set("lib") {
   sources = [
     "context.cc",
     "context.h",
     "scoped_user_data_dir.cc",
     "scoped_user_data_dir.h",
     "task_runners.cc",
@@ skipping 21 matching lines @@
     "//mojo/shell",
     "//mojo/util:filename_util",
     "//third_party/mojo/src/mojo/edk/system",
     "//ui/gl",
     "//url",
   ]
 
   public_deps = [
     ":init",
     ":switches",
+    "//mojo/shell",
   ]
 
   if (!is_component_build) {
     data_deps = [
       "//components/devtools_service",
       "//mojo/services/tracing",
     ]
   }
 
   if (is_android) {
@@ skipping 160 matching lines @@
     ]
   }
 
   copy_ex("copy_mojo_runner_test_assets") {
     testonly = true
     clear_dir = true
     dest = mojo_runner_test_assets_dir
     deps = [
       "//mojo/services/test_service:test_app",
       "//mojo/services/test_service:test_request_tracker_app",
+      "//third_party/icu:icudata",
     ]
 
     # Directories can't be specified as sources so pass manually to the script.
     args = [
+      "--files=" + rebase_path("$root_out_dir/icudtl.dat", root_build_dir),
       "--files=" + rebase_path("$root_out_dir/test_app", root_build_dir),
       "--files=" +
           rebase_path("$root_out_dir/test_request_tracker_app", root_build_dir),
     ]
   }
 
   android_apk("mojo_runner_apptests_apk") {
     testonly = true
     apk_name = "MojoRunnerApptests"
     android_manifest = "android/apk/AndroidManifest.xml"
@@ skipping 12 matching lines @@
   }
 
   generate_mojo_shell_assets_list("build_mojo_runner_test_assets") {
     testonly = true
     deps = [
       ":copy_mojo_runner_test_assets",
     ]
     dir = mojo_runner_test_assets_dir
   }
 }