| 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/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 394 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 405     ":chrome_java_resources", | 405     ":chrome_java_resources", | 
| 406     ":chrome_shell_java", | 406     ":chrome_shell_java", | 
| 407     ":chrome_shell_resources", | 407     ":chrome_shell_resources", | 
| 408     ":chrome_shell_test_java", | 408     ":chrome_shell_test_java", | 
| 409     "//base:base_java", | 409     "//base:base_java", | 
| 410     "//base:base_java_test_support", | 410     "//base:base_java_test_support", | 
| 411     "//chrome/test/android:chrome_java_test_support", | 411     "//chrome/test/android:chrome_java_test_support", | 
| 412     "//components/bookmarks/common/android:bookmarks_java", | 412     "//components/bookmarks/common/android:bookmarks_java", | 
| 413     "//components/dom_distiller/android:dom_distiller_core_java", | 413     "//components/dom_distiller/android:dom_distiller_core_java", | 
| 414     "//components/invalidation:java", | 414     "//components/invalidation:java", | 
|  | 415     "//components/navigation_interception/android:navigation_interception_java", | 
|  | 416     "//components/precache/android:precache_java", | 
|  | 417     "//components/precache/android:precache_javatests", | 
| 415     "//content/public/android:content_java", | 418     "//content/public/android:content_java", | 
| 416     "//content/public/test/android:content_java_test_support", | 419     "//content/public/test/android:content_java_test_support", | 
| 417     "//printing:printing_java", | 420     "//printing:printing_java", | 
| 418     "//sync/android:sync_java", | 421     "//sync/android:sync_java", | 
|  | 422     "//sync/android:sync_javatests", | 
| 419     "//sync:sync_java_test_support", | 423     "//sync:sync_java_test_support", | 
|  | 424     "//third_party/android_protobuf:protobuf_nano_javalib", | 
| 420     "//third_party/android_tools:android_support_v13_java", | 425     "//third_party/android_tools:android_support_v13_java", | 
| 421     "//third_party/android_tools:android_support_v7_appcompat_java", | 426     "//third_party/android_tools:android_support_v7_appcompat_java", | 
| 422     "//third_party/cacheinvalidation:cacheinvalidation_javalib", | 427     "//third_party/cacheinvalidation:cacheinvalidation_javalib", | 
| 423     "//third_party/cacheinvalidation:cacheinvalidation_proto_java", | 428     "//third_party/cacheinvalidation:cacheinvalidation_proto_java", | 
| 424     "//third_party/jsr-305:jsr_305_javalib", | 429     "//third_party/jsr-305:jsr_305_javalib", | 
| 425     "//ui/android:ui_java", | 430     "//ui/android:ui_java", | 
| 426   ] | 431   ] | 
| 427 } | 432 } | 
| 428 | 433 | 
| 429 android_library("chrome_shell_test_java") { | 434 android_library("chrome_shell_test_java") { | 
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 461   java_files = | 466   java_files = | 
| 462       [ "junit/src/org/chromium/chrome/browser/omaha/ResponseParserTest.java" ] | 467       [ "junit/src/org/chromium/chrome/browser/omaha/ResponseParserTest.java" ] | 
| 463   deps = [ | 468   deps = [ | 
| 464     ":chrome_java", | 469     ":chrome_java", | 
| 465     "//base:base_java", | 470     "//base:base_java", | 
| 466     "//base:base_java_test_support", | 471     "//base:base_java_test_support", | 
| 467   ] | 472   ] | 
| 468 } | 473 } | 
| 469 | 474 | 
| 470 # GYP: //chrome/chrome_tests.gypi:chrome_sync_shell_test_apk | 475 # GYP: //chrome/chrome_tests.gypi:chrome_sync_shell_test_apk | 
| 471 android_apk("chrome_sync_shell_test_apk") { | 476 if (false) { | 
| 472   testonly = true | 477   # TODO(GYP): We need sync/sync_tests.gypi:test_support_sync_proto_java to be p
     orted. | 
| 473   deps = [ | 478   # crbug.com/475612 | 
| 474     ":chrome_java", | 479   android_apk("chrome_sync_shell_test_apk") { | 
| 475     ":chrome_shell_java", | 480     testonly = true | 
| 476     ":chrome_shell_test_java", | 481     deps = [ | 
| 477     "//base:base_java", | 482       ":chrome_java", | 
| 478     "//base:base_java_test_support", | 483       ":chrome_shell_java", | 
| 479     "//chrome/test/android:chrome_java_test_support", | 484       ":chrome_shell_test_java", | 
| 480     "//components/invalidation:java", | 485       "//base:base_java", | 
| 481     "//content/public/android:content_java", | 486       "//base:base_java_test_support", | 
| 482     "//content/public/test/android:content_java_test_support", | 487       "//chrome/test/android:chrome_java_test_support", | 
| 483     "//sync/android:sync_java", | 488       "//components/invalidation:java", | 
| 484     "//sync:sync_java_test_support", | 489       "//content/public/android:content_java", | 
| 485     "//third_party/android_tools:android_support_v13_java", | 490       "//content/public/test/android:content_java_test_support", | 
| 486     "//third_party/android_tools:android_support_v7_appcompat_java", | 491       "//sync/android:sync_java", | 
| 487     "//ui/android:ui_java", | 492       "//sync:sync_java_test_support", | 
| 488   ] | 493       "//third_party/android_tools:android_support_v13_java", | 
| 489   apk_name = "ChromeSyncShellTest" | 494       "//third_party/android_tools:android_support_v7_appcompat_java", | 
| 490   DEPRECATED_java_in_dir = "sync_shell/javatests/src" | 495       "//ui/android:ui_java", | 
| 491   android_manifest = "sync_shell/javatests/AndroidManifest.xml" | 496     ] | 
|  | 497     apk_name = "ChromeSyncShellTest" | 
|  | 498     DEPRECATED_java_in_dir = "sync_shell/javatests/src" | 
|  | 499     android_manifest = "sync_shell/javatests/AndroidManifest.xml" | 
|  | 500   } | 
| 492 } | 501 } | 
| 493 | 502 | 
| 494 # GYP: //chrome/chrome_tests.gypi:chrome_shell_uiautomator_tests_java | 503 # GYP: //chrome/chrome_tests.gypi:chrome_shell_uiautomator_tests_java | 
| 495 android_library("uiautomator_tests_java") { | 504 android_library("uiautomator_tests_java") { | 
| 496   testonly = true | 505   testonly = true | 
| 497   DEPRECATED_java_in_dir = "uiautomator_tests/src" | 506   DEPRECATED_java_in_dir = "uiautomator_tests/src" | 
| 498   deps = [ | 507   deps = [ | 
| 499     "//base:base_java_test_support", | 508     "//base:base_java_test_support", | 
| 500     "//third_party/android_tools:uiautomator_java", | 509     "//third_party/android_tools:uiautomator_java", | 
| 501   ] | 510   ] | 
| (...skipping 19 matching lines...) Expand all  Loading... | 
| 521   ] | 530   ] | 
| 522 } | 531 } | 
| 523 | 532 | 
| 524 zip("chrome_version_srcjar") { | 533 zip("chrome_version_srcjar") { | 
| 525   inputs = [ | 534   inputs = [ | 
| 526     chrome_version_java_file, | 535     chrome_version_java_file, | 
| 527   ] | 536   ] | 
| 528   output = "$target_gen_dir/$target_name.srcjar" | 537   output = "$target_gen_dir/$target_name.srcjar" | 
| 529   base_dir = chrome_version_java_dir | 538   base_dir = chrome_version_java_dir | 
| 530 } | 539 } | 
| OLD | NEW | 
|---|