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

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

Issue 2225683002: Re-enable WebApkServiceImplTest (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge branch 'master' into webapk_disabled_test Created 4 years, 4 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 | « no previous file | chrome/android/javatests/AndroidManifest.xml » ('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_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 585 matching lines...) Expand 10 before | Expand all | Expand 10 after
596 apk_under_test = ":chrome_public_apk" 596 apk_under_test = ":chrome_public_apk"
597 android_manifest = chrome_public_test_apk_manifest 597 android_manifest = chrome_public_test_apk_manifest
598 android_manifest_dep = ":chrome_public_test_apk_manifest" 598 android_manifest_dep = ":chrome_public_test_apk_manifest"
599 599
600 deps = [ 600 deps = [
601 ":chrome_test_java", 601 ":chrome_test_java",
602 "//chrome/android/webapk/libs/runtime_library:runtime_library_javatests", 602 "//chrome/android/webapk/libs/runtime_library:runtime_library_javatests",
603 "//chrome/android/webapk/shell_apk:shell_apk_javatests", 603 "//chrome/android/webapk/shell_apk:shell_apk_javatests",
604 ] 604 ]
605 additional_apks = [ 605 additional_apks = [
606 "//chrome/android/webapk/libs/runtime_library/javatests/apk_with_webapk_serv ice:apk_with_webapk_service",
606 "//chrome/android/webapk/shell_apk/javatests/dex_optimizer:dex_optimizer_apk ", 607 "//chrome/android/webapk/shell_apk/javatests/dex_optimizer:dex_optimizer_apk ",
607 "//chrome/test/android/chrome_public_test_support:chrome_public_test_support _apk", 608 "//chrome/test/android/chrome_public_test_support:chrome_public_test_support _apk",
608 "//net/android:net_test_support_apk", 609 "//net/android:net_test_support_apk",
609 ] 610 ]
610 proguard_enabled = !is_java_debug 611 proguard_enabled = !is_java_debug
611 } 612 }
612 613
613 android_library("chrome_sync_shell_test_apk_java") { 614 android_library("chrome_sync_shell_test_apk_java") {
614 testonly = true 615 testonly = true
615 616
(...skipping 22 matching lines...) Expand all
638 instrumentation_test_apk("chrome_sync_shell_test_apk") { 639 instrumentation_test_apk("chrome_sync_shell_test_apk") {
639 apk_name = "ChromeSyncShellTest" 640 apk_name = "ChromeSyncShellTest"
640 apk_under_test = ":chrome_sync_shell_apk" 641 apk_under_test = ":chrome_sync_shell_apk"
641 android_manifest = chrome_sync_shell_test_apk_manifest 642 android_manifest = chrome_sync_shell_test_apk_manifest
642 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest" 643 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest"
643 deps = [ 644 deps = [
644 ":chrome_sync_shell_test_apk_java", 645 ":chrome_sync_shell_test_apk_java",
645 ] 646 ]
646 proguard_enabled = !is_java_debug 647 proguard_enabled = !is_java_debug
647 } 648 }
OLDNEW
« no previous file with comments | « no previous file | chrome/android/javatests/AndroidManifest.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698