Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(35)

Side by Side Diff: shell/BUILD.gn

Issue 1431663002: Update android SDK to API version 23. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Folloe review Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « build/config/android/config.gni ('k') | shell/android/apk/AndroidManifest.xml.jinja2 » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 ] 324 ]
325 325
326 deps = [ 326 deps = [
327 "//base", 327 "//base",
328 ] 328 ]
329 } 329 }
330 330
331 android_library("java") { 331 android_library("java") {
332 java_files = [ 332 java_files = [
333 "android/apk/src/org/chromium/mojo/shell/AndroidHandler.java", 333 "android/apk/src/org/chromium/mojo/shell/AndroidHandler.java",
334 "android/apk/src/org/chromium/mojo/shell/BaseActivity.java",
334 "android/apk/src/org/chromium/mojo/shell/FileHelper.java", 335 "android/apk/src/org/chromium/mojo/shell/FileHelper.java",
335 "android/apk/src/org/chromium/mojo/shell/IntentReceiverActivity.java", 336 "android/apk/src/org/chromium/mojo/shell/IntentReceiverActivity.java",
336 "android/apk/src/org/chromium/mojo/shell/IntentReceiverRegistry.java", 337 "android/apk/src/org/chromium/mojo/shell/IntentReceiverRegistry.java",
337 "android/apk/src/org/chromium/mojo/shell/JavaApplicationRegistry.java", 338 "android/apk/src/org/chromium/mojo/shell/JavaApplicationRegistry.java",
338 "android/apk/src/org/chromium/mojo/shell/KeyboardFactory.java", 339 "android/apk/src/org/chromium/mojo/shell/KeyboardFactory.java",
339 "android/apk/src/org/chromium/mojo/shell/MojoShellActivity.java", 340 "android/apk/src/org/chromium/mojo/shell/MojoShellActivity.java",
340 "android/apk/src/org/chromium/mojo/shell/MojoShellApplication.java", 341 "android/apk/src/org/chromium/mojo/shell/MojoShellApplication.java",
341 "android/apk/src/org/chromium/mojo/shell/NativeViewportSupportApplicationD elegate.java", 342 "android/apk/src/org/chromium/mojo/shell/NativeViewportSupportApplicationD elegate.java",
342 "android/apk/src/org/chromium/mojo/shell/NfcApplicationDelegate.java", 343 "android/apk/src/org/chromium/mojo/shell/NfcApplicationDelegate.java",
343 "android/apk/src/org/chromium/mojo/shell/NfcDbManager.java", 344 "android/apk/src/org/chromium/mojo/shell/NfcDbManager.java",
(...skipping 17 matching lines...) Expand all
361 "//mojo/services/keyboard/interfaces:interfaces_java", 362 "//mojo/services/keyboard/interfaces:interfaces_java",
362 "//services/authentication", 363 "//services/authentication",
363 "//services/location", 364 "//services/location",
364 "//services/intent_receiver:bindings_java", 365 "//services/intent_receiver:bindings_java",
365 "//services/native_viewport:interfaces_java", 366 "//services/native_viewport:interfaces_java",
366 "//services/nfc_message_sink:bindings_java", 367 "//services/nfc_message_sink:bindings_java",
367 "//services/sharing_sink:bindings_java", 368 "//services/sharing_sink:bindings_java",
368 "//mojo/services/nfc/interfaces:interfaces_java", 369 "//mojo/services/nfc/interfaces:interfaces_java",
369 "//services/keyboard", 370 "//services/keyboard",
370 "//services/native_viewport:native_viewport_java", 371 "//services/native_viewport:native_viewport_java",
372 "//third_party/android_tools:android_support_v13_java",
371 ] 373 ]
372 } 374 }
373 375
374 if (is_official_build) { 376 if (is_official_build) {
375 icon_dir = "android/apk/res-official" 377 icon_dir = "android/apk/res-official"
376 } else { 378 } else {
377 icon_dir = "android/apk/res-dev" 379 icon_dir = "android/apk/res-dev"
378 } 380 }
379 381
380 android_resources("resources") { 382 android_resources("resources") {
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
641 "//mojo/public/cpp/bindings:callback", 643 "//mojo/public/cpp/bindings:callback",
642 "//mojo/public/cpp/environment", 644 "//mojo/public/cpp/environment",
643 "//mojo/public/cpp/system:system", 645 "//mojo/public/cpp/system:system",
644 "//mojo/services/http_server/cpp", 646 "//mojo/services/http_server/cpp",
645 "//mojo/services/http_server/interfaces", 647 "//mojo/services/http_server/interfaces",
646 "//mojo/services/network/interfaces", 648 "//mojo/services/network/interfaces",
647 "//shell/test:bindings", 649 "//shell/test:bindings",
648 ":embed_pingable", 650 ":embed_pingable",
649 ] 651 ]
650 652
651 data_deps = [ "//services/http_server:http_server($default_toolchain)" ] 653 data_deps = [
654 "//services/http_server:http_server($default_toolchain)",
655 ]
652 } 656 }
653 657
654 mojo_native_application("shell_nfc_apptests") { 658 mojo_native_application("shell_nfc_apptests") {
655 output_name = "shell_nfc_apptests" 659 output_name = "shell_nfc_apptests"
656 660
657 testonly = true 661 testonly = true
658 662
659 sources = [ 663 sources = [
660 "android/nfc_apptest.cc", 664 "android/nfc_apptest.cc",
661 ] 665 ]
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
693 "${root_out_dir}/libmojo_shell.so", 697 "${root_out_dir}/libmojo_shell.so",
694 ] 698 ]
695 } else { 699 } else {
696 sources += [ "${root_out_dir}/mojo_shell" ] 700 sources += [ "${root_out_dir}/mojo_shell" ]
697 } 701 }
698 702
699 outputs = [ 703 outputs = [
700 "${root_out_dir}/symbols/{{source_file_part}}", 704 "${root_out_dir}/symbols/{{source_file_part}}",
701 ] 705 ]
702 } 706 }
OLDNEW
« no previous file with comments | « build/config/android/config.gni ('k') | shell/android/apk/AndroidManifest.xml.jinja2 » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698