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_overrides/v8.gni") | 7 import("//build_overrides/v8.gni") |
8 import("//chrome/android/chrome_public_apk_tmpl.gni") | 8 import("//chrome/android/chrome_public_apk_tmpl.gni") |
9 import("//chrome/common/features.gni") | 9 import("//chrome/common/features.gni") |
10 import("//chrome/version.gni") | 10 import("//chrome/version.gni") |
(...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
545 | 545 |
546 # GYP: //chrome/android/chrome_apk.gyp:chrome_public_test_apk | 546 # GYP: //chrome/android/chrome_apk.gyp:chrome_public_test_apk |
547 instrumentation_test_apk("chrome_public_test_apk") { | 547 instrumentation_test_apk("chrome_public_test_apk") { |
548 apk_name = "ChromePublicTest" | 548 apk_name = "ChromePublicTest" |
549 apk_under_test = ":chrome_public_apk" | 549 apk_under_test = ":chrome_public_apk" |
550 android_manifest = chrome_public_test_apk_manifest | 550 android_manifest = chrome_public_test_apk_manifest |
551 | 551 |
552 deps = [ | 552 deps = [ |
553 ":chrome_public_test_apk_manifest", | 553 ":chrome_public_test_apk_manifest", |
554 ":chrome_test_java", | 554 ":chrome_test_java", |
| 555 "//chrome/android/webapk/shell_apk:shell_apk_javatests", |
555 ] | 556 ] |
556 additional_apks = [ | 557 additional_apks = [ |
| 558 "//chrome/android/webapk/shell_apk/javatests/dex_optimizer:dex_optimizer_apk
", |
557 "//chrome/test/android/chrome_public_test_support:chrome_public_test_support
_apk", | 559 "//chrome/test/android/chrome_public_test_support:chrome_public_test_support
_apk", |
558 "//net/android:net_test_support_apk", | 560 "//net/android:net_test_support_apk", |
559 ] | 561 ] |
560 isolate_file = "../chrome_public_test_apk.isolate" | 562 isolate_file = "../chrome_public_test_apk.isolate" |
561 proguard_enabled = !is_debug | 563 proguard_enabled = !is_debug |
562 } | 564 } |
563 | 565 |
564 android_library("chrome_sync_shell_test_apk_java") { | 566 android_library("chrome_sync_shell_test_apk_java") { |
565 testonly = true | 567 testonly = true |
566 | 568 |
(...skipping 24 matching lines...) Expand all Loading... |
591 instrumentation_test_apk("chrome_sync_shell_test_apk") { | 593 instrumentation_test_apk("chrome_sync_shell_test_apk") { |
592 apk_name = "ChromeSyncShellTest" | 594 apk_name = "ChromeSyncShellTest" |
593 apk_under_test = ":chrome_sync_shell_apk" | 595 apk_under_test = ":chrome_sync_shell_apk" |
594 android_manifest = chrome_sync_shell_test_apk_manifest | 596 android_manifest = chrome_sync_shell_test_apk_manifest |
595 deps = [ | 597 deps = [ |
596 ":chrome_sync_shell_test_apk_java", | 598 ":chrome_sync_shell_test_apk_java", |
597 ":chrome_sync_shell_test_apk_manifest", | 599 ":chrome_sync_shell_test_apk_manifest", |
598 ] | 600 ] |
599 proguard_enabled = !is_debug | 601 proguard_enabled = !is_debug |
600 } | 602 } |
OLD | NEW |