| 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 389 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 400 #TODO(GYP): | 400 #TODO(GYP): |
| 401 #'variables': { | 401 #'variables': { |
| 402 #'conditions': [ | 402 #'conditions': [ |
| 403 #['component != "shared_library" and target_arch != "arm64" and target_arch !=
"x64" and profiling_full_stack_frames != 1', { | 403 #['component != "shared_library" and target_arch != "arm64" and target_arch !=
"x64" and profiling_full_stack_frames != 1', { |
| 404 ## Only enable the chromium linker on regular builds, since the | 404 ## Only enable the chromium linker on regular builds, since the |
| 405 ## component build crashes on Android 4.4. See b/11379966 | 405 ## component build crashes on Android 4.4. See b/11379966 |
| 406 #'use_chromium_linker': '1', | 406 #'use_chromium_linker': '1', |
| 407 #}], | 407 #}], |
| 408 #], | 408 #], |
| 409 #}, | 409 #}, |
| 410 if (!is_debug) { |
| 411 proguard_enabled = true |
| 412 proguard_configs = [ "shell/java/proguard.flags" ] |
| 413 } |
| 410 } | 414 } |
| 411 | 415 |
| 412 chrome_sync_shell_manifest = | 416 chrome_sync_shell_manifest = |
| 413 "$target_gen_dir/chrome_sync_shell_manifest/AndroidManifest.xml" | 417 "$target_gen_dir/chrome_sync_shell_manifest/AndroidManifest.xml" |
| 414 | 418 |
| 415 # GYP: //chrome/chrome_shell.gypi:chrome_sync_shell_manifest | 419 # GYP: //chrome/chrome_shell.gypi:chrome_sync_shell_manifest |
| 416 jinja_template("chrome_sync_shell_manifest") { | 420 jinja_template("chrome_sync_shell_manifest") { |
| 417 testonly = true | 421 testonly = true |
| 418 input = "sync_shell/java/AndroidManifest.xml.jinja2" | 422 input = "sync_shell/java/AndroidManifest.xml.jinja2" |
| 419 output = chrome_sync_shell_manifest | 423 output = chrome_sync_shell_manifest |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 485 "//content/public/test/android:content_java_test_support", | 489 "//content/public/test/android:content_java_test_support", |
| 486 "//third_party/android_tools:android_support_v13_java", | 490 "//third_party/android_tools:android_support_v13_java", |
| 487 "//third_party/android_tools:android_support_v7_appcompat_java", | 491 "//third_party/android_tools:android_support_v7_appcompat_java", |
| 488 "//ui/android:ui_java", | 492 "//ui/android:ui_java", |
| 489 ] | 493 ] |
| 490 DEPRECATED_java_in_dir = "shell/javatests/src" | 494 DEPRECATED_java_in_dir = "shell/javatests/src" |
| 491 } | 495 } |
| 492 | 496 |
| 493 # GYP: //chrome/chrome_tests.gypi:chrome_shell_test_apk | 497 # GYP: //chrome/chrome_tests.gypi:chrome_shell_test_apk |
| 494 instrumentation_test_apk("chrome_shell_test_apk") { | 498 instrumentation_test_apk("chrome_shell_test_apk") { |
| 499 if (!is_debug) { |
| 500 proguard_enabled = true |
| 501 } |
| 495 apk_under_test = ":chrome_shell_apk" | 502 apk_under_test = ":chrome_shell_apk" |
| 496 deps = [ | 503 deps = [ |
| 497 ":chrome_javatests", | 504 ":chrome_javatests", |
| 498 ":chrome_shell_test_java", | 505 ":chrome_shell_test_java", |
| 499 "//sync/android:sync_javatests", | 506 "//sync/android:sync_javatests", |
| 500 "//ui/android:ui_javatests", | 507 "//ui/android:ui_javatests", |
| 501 ] | 508 ] |
| 502 apk_name = "ChromeShellTest" | 509 apk_name = "ChromeShellTest" |
| 503 android_manifest = "shell/javatests/AndroidManifest.xml" | 510 android_manifest = "shell/javatests/AndroidManifest.xml" |
| 504 isolate_file = "../chrome_shell_test_apk.isolate" | 511 isolate_file = "../chrome_shell_test_apk.isolate" |
| (...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 743 # TODO(GYP,cjhopman): Does this need version code/name? | 750 # TODO(GYP,cjhopman): Does this need version code/name? |
| 744 apk_name = "ChromePublicTest" | 751 apk_name = "ChromePublicTest" |
| 745 apk_under_test = ":chrome_public_apk" | 752 apk_under_test = ":chrome_public_apk" |
| 746 android_manifest = chrome_public_test_apk_manifest | 753 android_manifest = chrome_public_test_apk_manifest |
| 747 deps = [ | 754 deps = [ |
| 748 ":chrome_public_test_apk_manifest", | 755 ":chrome_public_test_apk_manifest", |
| 749 "//chrome/android:chrome_shared_test_java", | 756 "//chrome/android:chrome_shared_test_java", |
| 750 ] | 757 ] |
| 751 isolate_file = "../chrome_public_test_apk.isolate" | 758 isolate_file = "../chrome_public_test_apk.isolate" |
| 752 } | 759 } |
| OLD | NEW |