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

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

Issue 2031033002: Adding option for Proguard jar to be switched. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed single newline Created 4 years, 6 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/config/android/rules.gni ('k') | chrome/android/chrome_public_apk_tmpl.gni » ('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 543 matching lines...) Expand 10 before | Expand all | Expand 10 after
554 ":chrome_public_test_apk_manifest", 554 ":chrome_public_test_apk_manifest",
555 ":chrome_test_java", 555 ":chrome_test_java",
556 "//chrome/android/webapk/shell_apk:shell_apk_javatests", 556 "//chrome/android/webapk/shell_apk:shell_apk_javatests",
557 ] 557 ]
558 additional_apks = [ 558 additional_apks = [
559 "//chrome/android/webapk/shell_apk/javatests/dex_optimizer:dex_optimizer_apk ", 559 "//chrome/android/webapk/shell_apk/javatests/dex_optimizer:dex_optimizer_apk ",
560 "//chrome/test/android/chrome_public_test_support:chrome_public_test_support _apk", 560 "//chrome/test/android/chrome_public_test_support:chrome_public_test_support _apk",
561 "//net/android:net_test_support_apk", 561 "//net/android:net_test_support_apk",
562 ] 562 ]
563 isolate_file = "../chrome_public_test_apk.isolate" 563 isolate_file = "../chrome_public_test_apk.isolate"
564 proguard_enabled = !is_debug 564 proguard_enabled = !is_java_debug
565 } 565 }
566 566
567 android_library("chrome_sync_shell_test_apk_java") { 567 android_library("chrome_sync_shell_test_apk_java") {
568 testonly = true 568 testonly = true
569 569
570 # From java_sources.jni. 570 # From java_sources.jni.
571 java_files = sync_shell_test_java_sources 571 java_files = sync_shell_test_java_sources
572 572
573 deps = [ 573 deps = [
574 "//base:base_java", 574 "//base:base_java",
(...skipping 17 matching lines...) Expand all
592 592
593 # GYP: //chrome/android/chrome_apk.gyp:chrome_sync_shell_test_apk 593 # GYP: //chrome/android/chrome_apk.gyp:chrome_sync_shell_test_apk
594 instrumentation_test_apk("chrome_sync_shell_test_apk") { 594 instrumentation_test_apk("chrome_sync_shell_test_apk") {
595 apk_name = "ChromeSyncShellTest" 595 apk_name = "ChromeSyncShellTest"
596 apk_under_test = ":chrome_sync_shell_apk" 596 apk_under_test = ":chrome_sync_shell_apk"
597 android_manifest = chrome_sync_shell_test_apk_manifest 597 android_manifest = chrome_sync_shell_test_apk_manifest
598 deps = [ 598 deps = [
599 ":chrome_sync_shell_test_apk_java", 599 ":chrome_sync_shell_test_apk_java",
600 ":chrome_sync_shell_test_apk_manifest", 600 ":chrome_sync_shell_test_apk_manifest",
601 ] 601 ]
602 proguard_enabled = !is_debug 602 proguard_enabled = !is_java_debug
603 } 603 }
OLDNEW
« no previous file with comments | « build/config/android/rules.gni ('k') | chrome/android/chrome_public_apk_tmpl.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698