Gets mandoline working on android

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("//build/config/ui.gni")
+import("//mojo/generate_mojo_shell_assets_list.gni")
 import("//third_party/mojo/src/mojo/public/mojo.gni")
 import("//third_party/mojo/src/mojo/public/mojo_application.gni")
 import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
 import("//testing/test.gni")
 
 # We don't support building in the component build since mojo apps are
 # inherently components.
 assert(!is_component_build)
 
 group("runner") {
   testonly = true
 
   deps = [
     ":mojo_runner",
   ]
 
   if (is_android) {
     deps += [ ":mojo_runner_apk" ]
   }
 }
 
 if (is_android) {
   import("//build/config/android/config.gni")
   import("//build/config/android/rules.gni")
 }
 
-executable("mojo_runner") {
+source_set("mojo_runner_lib") {
   sources = []
 
   deps = [
     ":lib",
     "//base",
     "//build/config/sanitizers:deps",
     "//mojo/common",
     "//mojo/environment:chromium",
   ]
 
   if (!is_android) {
     sources += [
       "desktop/launcher_process.cc",
       "desktop/launcher_process.h",
       "desktop/main.cc",
     ]
   } else {
     sources += [
+      "android/context_init.h",
       "android/library_loader.cc",
       "android/main.cc",
       "android/main.h",
     ]
 
-    # On android, the executable is also the native library used by the apk.
-    # It means dynamic symbols must be preserved and exported.
-    ldflags = [ "-Wl,--export-dynamic" ]
-
     deps += [
       ":jni_headers",
       "//components/native_viewport:lib",
       "//mojo/shell",
       "//ui/gl",
     ]
   }
 }
 
+executable("mojo_runner") {
+  deps = [
+    ":mojo_runner_lib",
+  ]
+
+  if (is_android) {
+    sources = [
+      "android/context_init.cc",
+    ]
+
+    # On android, the executable is also the native library used by the apk.
+    # It means dynamic symbols must be preserved and exported.
+    ldflags = [ "-Wl,--export-dynamic" ]
+  }
+}
+
 source_set("in_process_native_runner") {
   sources = [
     "in_process_native_runner.cc",
     "in_process_native_runner.h",
   ]
 
   public_deps = [
     ":native_application_support",
     "//mojo/shell",
   ]
@@ skipping 164 matching lines @@
   android_library("java") {
     java_files = [
       "android/apk/src/org/chromium/mojo/shell/AndroidHandler.java",
       "android/apk/src/org/chromium/mojo/shell/FileHelper.java",
       "android/apk/src/org/chromium/mojo/shell/MojoShellActivity.java",
       "android/apk/src/org/chromium/mojo/shell/MojoShellApplication.java",
       "android/apk/src/org/chromium/mojo/shell/ShellMain.java",
     ]
 
     deps = [
+      ":resources",
       "//base:base_java",
     ]
   }
 
   android_resources("resources") {
     resource_dirs = [ "android/apk/res" ]
     custom_package = "org.chromium.mojo.shell"
   }
 
   mojo_runner_assets_dir = "$root_build_dir/mojo_runner_assets"
   mojo_runner_test_assets_dir = "$root_build_dir/mojo_runner_test_assets"
 
   copy_ex("copy_mojo_runner_assets") {
     clear_dir = true
     dest = mojo_runner_assets_dir
+    deps = [
+      ":copy_mojo_runner",
+    ]
     sources = [
       "$root_out_dir/lib.stripped/libbootstrap.so",
       "$root_out_dir/network_service.mojo",
       "$root_out_dir/obj/mojo/runner/bootstrap_java.dex.jar",
     ]
   }
 
+  generate_mojo_shell_assets_list("build_mojo_runner_assets") {
+    deps = [
+      ":copy_mojo_runner_assets",
+    ]
+    dir = mojo_runner_assets_dir
+  }
+
   copy("copy_mojo_runner") {
     sources = [
       "$root_out_dir/exe.stripped/mojo_runner",
     ]
     outputs = [
       "$root_out_dir/lib.stripped/libmojo_runner.so",
     ]
   }
 
   copy_ex("copy_mojo_runner_test_assets") {
     clear_dir = true
     dest = mojo_runner_test_assets_dir
     sources = [
       "$root_out_dir/test_app.mojo",
       "$root_out_dir/test_request_tracker_app.mojo",
     ]
   }
 
   android_apk("mojo_runner_apk") {
     apk_name = "MojoRunner"
 
     android_manifest = "android/apk/AndroidManifest.xml"
 
     native_libs = [ "libmojo_runner.so" ]
 
     asset_location = mojo_runner_assets_dir
 
     deps = [
-      ":copy_mojo_runner",
-      ":copy_mojo_runner_assets",
+      ":build_mojo_runner_assets",
       ":java",
       ":resources",
       "//base:base_java",
       "//components/native_viewport:native_viewport_java",
       "//third_party/android_tools:google_play_services_default_resources",
     ]
   }
 
+  generate_mojo_shell_assets_list("build_mojo_runner_test_assets") {
+    deps = [
+      ":copy_mojo_runner_test_assets",
+    ]
+    dir = mojo_runner_test_assets_dir
+  }
+
   android_library("mojo_runner_tests_java") {
     java_files =
         [ "android/tests/src/org/chromium/mojo/shell/ShellTestBase.java" ]
 
     deps = [
       ":java",
       "//base:base_java",
     ]
   }
 }
@@ skipping 44 matching lines @@
     "//mojo/services/test_service:test_app",
     "//mojo/services/test_service:test_request_tracker_app",
   ]
 
   if (is_android) {
     sources += [ "android/background_application_loader_unittest.cc" ]
 
     deps += [ ":jni_headers" ]
 
     apk_deps = [
-      ":copy_mojo_runner_test_assets",
+      ":build_mojo_runner_test_assets",
       ":mojo_runner_tests_java",
     ]
 
     apk_asset_location = mojo_runner_test_assets_dir
   }
 }
 
 mojo_native_application("apptests") {
   output_name = "runner_apptests"
 
@@ skipping 15 matching lines @@
     #"//mojo/services/http_server/public/interfaces",
     "//mojo/services/network/public/interfaces",
 
     "//third_party/mojo/src/mojo/public/cpp/bindings:callback",
     "//third_party/mojo/src/mojo/public/cpp/environment",
     "//third_party/mojo/src/mojo/public/cpp/system:system",
   ]
 
   #data_deps = [ "//services/http_server:http_server($default_toolchain)" ]
 }