| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import("//build/config/ui.gni") | 5 import("//build/config/ui.gni") |
| 6 import("//mojo/public/mojo.gni") | 6 import("//mojo/public/mojo.gni") |
| 7 import("//mojo/public/mojo_application.gni") | 7 import("//mojo/public/mojo_application.gni") |
| 8 import("//mojo/public/tools/bindings/mojom.gni") | 8 import("//mojo/public/tools/bindings/mojom.gni") |
| 9 import("//mojo/tools/embed/rules.gni") | 9 import("//mojo/tools/embed/rules.gni") |
| 10 import("//testing/test.gni") | 10 import("//testing/test.gni") |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 if (is_android) { | 56 if (is_android) { |
| 57 shared_library("mojo_shell") { | 57 shared_library("mojo_shell") { |
| 58 sources = [ | 58 sources = [ |
| 59 "android/library_loader.cc", | 59 "android/library_loader.cc", |
| 60 "android/main.cc", | 60 "android/main.cc", |
| 61 "android/main.h", | 61 "android/main.h", |
| 62 ] | 62 ] |
| 63 | 63 |
| 64 deps = shell_common_deps + [ | 64 deps = shell_common_deps + [ |
| 65 ":jni_headers", | 65 ":jni_headers", |
| 66 "//mojo/android:libsystem_java", |
| 66 "//services/native_viewport:lib", | 67 "//services/native_viewport:lib", |
| 67 "//shell/application_manager", | 68 "//shell/application_manager", |
| 68 "//ui/gl", | 69 "//ui/gl", |
| 69 ] | 70 ] |
| 70 | 71 |
| 71 data_deps = shell_common_data_deps | 72 data_deps = shell_common_data_deps |
| 72 } | 73 } |
| 73 } else { | 74 } else { |
| 74 executable("mojo_shell") { | 75 executable("mojo_shell") { |
| 75 sources = [ | 76 sources = [ |
| (...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 288 "android/apk/src/org/chromium/mojo/shell/FileHelper.java", | 289 "android/apk/src/org/chromium/mojo/shell/FileHelper.java", |
| 289 "android/apk/src/org/chromium/mojo/shell/IntentReceiverRegistry.java", | 290 "android/apk/src/org/chromium/mojo/shell/IntentReceiverRegistry.java", |
| 290 "android/apk/src/org/chromium/mojo/shell/Keyboard.java", | 291 "android/apk/src/org/chromium/mojo/shell/Keyboard.java", |
| 291 "android/apk/src/org/chromium/mojo/shell/MojoShellActivity.java", | 292 "android/apk/src/org/chromium/mojo/shell/MojoShellActivity.java", |
| 292 "android/apk/src/org/chromium/mojo/shell/MojoShellApplication.java", | 293 "android/apk/src/org/chromium/mojo/shell/MojoShellApplication.java", |
| 293 "android/apk/src/org/chromium/mojo/shell/ShellMain.java", | 294 "android/apk/src/org/chromium/mojo/shell/ShellMain.java", |
| 294 ] | 295 ] |
| 295 | 296 |
| 296 deps = [ | 297 deps = [ |
| 297 "//base:base_java", | 298 "//base:base_java", |
| 299 "//mojo/android:system_java", |
| 300 "//mojo/public/java:system", |
| 301 "//mojo/services/keyboard/public/interfaces:interfaces_java", |
| 302 "//services/keyboard", |
| 298 ] | 303 ] |
| 299 } | 304 } |
| 300 | 305 |
| 301 android_resources("resources") { | 306 android_resources("resources") { |
| 302 resource_dirs = [ "android/apk/res" ] | 307 resource_dirs = [ "android/apk/res" ] |
| 303 custom_package = "org.chromium.mojo.shell" | 308 custom_package = "org.chromium.mojo.shell" |
| 304 } | 309 } |
| 305 | 310 |
| 306 mojo_shell_assets_dir = "$root_build_dir/mojo_shell_assets" | 311 mojo_shell_assets_dir = "$root_build_dir/mojo_shell_assets" |
| 307 mojo_shell_test_assets_dir = "$root_build_dir/mojo_shell_test_assets" | 312 mojo_shell_test_assets_dir = "$root_build_dir/mojo_shell_test_assets" |
| (...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 448 "//mojo/public/cpp/system:system", | 453 "//mojo/public/cpp/system:system", |
| 449 "//mojo/services/http_server/public/cpp", | 454 "//mojo/services/http_server/public/cpp", |
| 450 "//mojo/services/http_server/public/interfaces", | 455 "//mojo/services/http_server/public/interfaces", |
| 451 "//mojo/services/network/public/interfaces", | 456 "//mojo/services/network/public/interfaces", |
| 452 "//shell/test:bindings", | 457 "//shell/test:bindings", |
| 453 ":embed_pingable", | 458 ":embed_pingable", |
| 454 ] | 459 ] |
| 455 | 460 |
| 456 data_deps = [ "//services/http_server:http_server($default_toolchain)" ] | 461 data_deps = [ "//services/http_server:http_server($default_toolchain)" ] |
| 457 } | 462 } |
| OLD | NEW |