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

Side by Side Diff: chrome/android/BUILD.gn

Issue 1282603005: Convert ChromeSyncShell to use ChromePublic infrastructure (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: re-land version Created 5 years, 3 months 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/get_landmines.py ('k') | chrome/android/chrome_apk.gyp » ('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/android/config.gni") 5 import("//build/config/android/config.gni")
6 import("//build/config/android/rules.gni") 6 import("//build/config/android/rules.gni")
7 import("//build/module_args/v8.gni") 7 import("//build/module_args/v8.gni")
8 import("//chrome/version.gni") 8 import("//chrome/version.gni")
9 import("//testing/test.gni") 9 import("//testing/test.gni")
10 import("//third_party/icu/config.gni") 10 import("//third_party/icu/config.gni")
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 sources = [ 240 sources = [
241 "shell/chrome_main_delegate_chrome_shell_android.cc", 241 "shell/chrome_main_delegate_chrome_shell_android.cc",
242 "shell/chrome_main_delegate_chrome_shell_android.h", 242 "shell/chrome_main_delegate_chrome_shell_android.h",
243 "shell/chrome_shell_entry_point.cc", 243 "shell/chrome_shell_entry_point.cc",
244 ] 244 ]
245 deps = [ 245 deps = [
246 ":chrome_shell_base", 246 ":chrome_shell_base",
247 ] 247 ]
248 } 248 }
249 249
250 # GYP: //chrome/chrome_shell.gypi:libchromesyncshell
251 shared_library("chrome_sync_shell") {
252 testonly = true
253 sources = [
254 #"shell/chrome_shell_entry_point.cc",
255 #"sync_shell/chrome_main_delegate_chrome_sync_shell_android.cc",
256 #"sync_shell/chrome_main_delegate_chrome_sync_shell_android.h",
257 ]
258 deps = [
259 "//sync:test_support_sync_fake_server_android",
260 ]
261 data_deps = [ ":chrome_shell_base" ]
262 }
263
264 # GYP: N/A 250 # GYP: N/A
265 android_resources("chrome_shell_resources") { 251 android_resources("chrome_shell_resources") {
266 deps = [ 252 deps = [
267 ":chrome_java_resources", 253 ":chrome_java_resources",
268 ] 254 ]
269 testonly = true 255 testonly = true
270 resource_dirs = [ "shell/res" ] 256 resource_dirs = [ "shell/res" ]
271 custom_package = "org.chromium.chrome.shell" 257 custom_package = "org.chromium.chrome.shell"
272 } 258 }
273 259
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 #'conditions': [ 387 #'conditions': [
402 #['component != "shared_library" and target_arch != "arm64" and target_arch != "x64" and profiling_full_stack_frames != 1', { 388 #['component != "shared_library" and target_arch != "arm64" and target_arch != "x64" and profiling_full_stack_frames != 1', {
403 ## Only enable the chromium linker on regular builds, since the 389 ## Only enable the chromium linker on regular builds, since the
404 ## component build crashes on Android 4.4. See b/11379966 390 ## component build crashes on Android 4.4. See b/11379966
405 #'use_chromium_linker': '1', 391 #'use_chromium_linker': '1',
406 #}], 392 #}],
407 #], 393 #],
408 #}, 394 #},
409 } 395 }
410 396
411 chrome_sync_shell_manifest =
412 "$target_gen_dir/chrome_sync_shell_manifest/AndroidManifest.xml"
413
414 # GYP: //chrome/chrome_shell.gypi:chrome_sync_shell_manifest
415 jinja_template("chrome_sync_shell_manifest") {
416 testonly = true
417 input = "sync_shell/java/AndroidManifest.xml.jinja2"
418 output = chrome_sync_shell_manifest
419 }
420
421 # GYP: //chrome/chrome_shell.gypi:chrome_sync_shell_apk
422 android_apk("chrome_sync_shell_apk") {
423 testonly = true
424 deps = [
425 ":chrome_shell_resources",
426 ":chrome_shell_java",
427 ":chrome_shell_assets",
428 ":chrome_sync_shell",
429 ":chrome_sync_shell_manifest",
430 "//base:base_java",
431 ]
432 apk_name = "ChromeSyncShell"
433 android_manifest = chrome_sync_shell_manifest
434 native_libs = [ "libchrome_sync_shell.so" ]
435 asset_location = chrome_shell_assets_dir
436 }
437
438 # GYP: part of //chrome/chrome_tests.gypi:chrome_shell_test_apk 397 # GYP: part of //chrome/chrome_tests.gypi:chrome_shell_test_apk
439 android_library("chrome_javatests") { 398 android_library("chrome_javatests") {
440 testonly = true 399 testonly = true
441 DEPRECATED_java_in_dir = "javatests_shell/src" 400 DEPRECATED_java_in_dir = "javatests_shell/src"
442 deps = [ 401 deps = [
443 ":chrome_java", 402 ":chrome_java",
444 ":chrome_java_resources", 403 ":chrome_java_resources",
445 ":chrome_shell_java", 404 ":chrome_shell_java",
446 ":chrome_shell_resources", 405 ":chrome_shell_resources",
447 ":chrome_shell_test_java", 406 ":chrome_shell_test_java",
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
512 ":chrome_java", 471 ":chrome_java",
513 "//base:base_java", 472 "//base:base_java",
514 "//base:base_java_test_support", 473 "//base:base_java_test_support",
515 "//sync:sync_java_test_support", 474 "//sync:sync_java_test_support",
516 "//sync/android:sync_java", 475 "//sync/android:sync_java",
517 "//third_party/junit:hamcrest", 476 "//third_party/junit:hamcrest",
518 "//third_party/android_tools:android_support_v7_mediarouter_java", 477 "//third_party/android_tools:android_support_v7_mediarouter_java",
519 ] 478 ]
520 } 479 }
521 480
522 # GYP: //chrome/chrome_tests.gypi:chrome_sync_shell_test_apk
523 if (false) {
524 # TODO(GYP): We need sync/sync_tests.gypi:test_support_sync_proto_java to be p orted.
525 # crbug.com/475612
526 instrumentation_test_apk("chrome_sync_shell_test_apk") {
527 apk_under_test = ":chrome_sync_shell_apk"
528 deps = [
529 ":chrome_java",
530 ":chrome_shell_java",
531 ":chrome_shell_test_java",
532 "//base:base_java",
533 "//base:base_java_test_support",
534 "//chrome/test/android:chrome_java_test_support",
535 "//components/invalidation/impl:java",
536 "//content/public/android:content_java",
537 "//content/public/test/android:content_java_test_support",
538 "//sync/android:sync_java",
539 "//sync:sync_java_test_support",
540 "//third_party/android_tools:android_support_v13_java",
541 "//third_party/android_tools:android_support_v7_appcompat_java",
542 "//ui/android:ui_java",
543 ]
544 apk_name = "ChromeSyncShellTest"
545 DEPRECATED_java_in_dir = "sync_shell/javatests/src"
546 android_manifest = "sync_shell/javatests/AndroidManifest.xml"
547 }
548 }
549
550 # GYP: //chrome/chrome_tests.gypi:chrome_uiautomator_tests_java 481 # GYP: //chrome/chrome_tests.gypi:chrome_uiautomator_tests_java
551 android_library("chrome_uiautomator_tests_java") { 482 android_library("chrome_uiautomator_tests_java") {
552 testonly = true 483 testonly = true
553 DEPRECATED_java_in_dir = "uiautomator_tests/src" 484 DEPRECATED_java_in_dir = "uiautomator_tests/src"
554 deps = [ 485 deps = [
555 "//base:base_java_test_support", 486 "//base:base_java_test_support",
556 "//third_party/android_tools:uiautomator_java", 487 "//third_party/android_tools:uiautomator_java",
557 ] 488 ]
558 } 489 }
559 490
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
753 # TODO(GYP,cjhopman): Does this need version code/name? 684 # TODO(GYP,cjhopman): Does this need version code/name?
754 apk_name = "ChromePublicTest" 685 apk_name = "ChromePublicTest"
755 apk_under_test = ":chrome_public_apk" 686 apk_under_test = ":chrome_public_apk"
756 android_manifest = chrome_public_test_apk_manifest 687 android_manifest = chrome_public_test_apk_manifest
757 deps = [ 688 deps = [
758 ":chrome_public_test_apk_manifest", 689 ":chrome_public_test_apk_manifest",
759 "//chrome/android:chrome_shared_test_java", 690 "//chrome/android:chrome_shared_test_java",
760 ] 691 ]
761 isolate_file = "../chrome_public_test_apk.isolate" 692 isolate_file = "../chrome_public_test_apk.isolate"
762 } 693 }
OLDNEW
« no previous file with comments | « build/get_landmines.py ('k') | chrome/android/chrome_apk.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698