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

Side by Side Diff: chrome/android/chrome_public_apk_tmpl.gni

Issue 2123753005: Creating new gn arg: enable_all_proguard_optimizations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased again Created 4 years, 5 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 | « chrome/android/BUILD.gn ('k') | testing/android/proguard_for_test.flags » ('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 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 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("//base/android/linker/config.gni") 5 import("//base/android/linker/config.gni")
6 import("//build/config/android/rules.gni") 6 import("//build/config/android/rules.gni")
7 import("//chrome/common/features.gni") 7 import("//chrome/common/features.gni")
8 import("//third_party/leakcanary/config.gni") 8 import("//third_party/leakcanary/config.gni")
9 import("channel.gni") 9 import("channel.gni")
10 10
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 enable_multidex = true 43 enable_multidex = true
44 } else { 44 } else {
45 proguard_enabled = true 45 proguard_enabled = true
46 _prev_proguard_configs = [] 46 _prev_proguard_configs = []
47 if (defined(proguard_configs)) { 47 if (defined(proguard_configs)) {
48 _prev_proguard_configs = proguard_configs 48 _prev_proguard_configs = proguard_configs
49 } 49 }
50 proguard_configs = [] 50 proguard_configs = []
51 proguard_configs = 51 proguard_configs =
52 [ "//chrome/android/java/proguard.flags" ] + _prev_proguard_configs 52 [ "//chrome/android/java/proguard.flags" ] + _prev_proguard_configs
53 if (!enable_all_proguard_optimizations) {
54 proguard_configs += [ "//testing/android/proguard_for_test.flags" ]
55 }
53 } 56 }
54 57
55 if (!defined(use_chromium_linker)) { 58 if (!defined(use_chromium_linker)) {
56 use_chromium_linker = chrome_public_apk_use_chromium_linker 59 use_chromium_linker = chrome_public_apk_use_chromium_linker
57 } 60 }
58 61
59 if (use_chromium_linker) { 62 if (use_chromium_linker) {
60 if (!defined(load_library_from_apk)) { 63 if (!defined(load_library_from_apk)) {
61 load_library_from_apk = chrome_public_apk_load_library_from_apk 64 load_library_from_apk = chrome_public_apk_load_library_from_apk
62 } 65 }
63 66
64 if (!defined(enable_relocation_packing)) { 67 if (!defined(enable_relocation_packing)) {
65 enable_relocation_packing = chrome_public_apk_use_relocation_packer 68 enable_relocation_packing = chrome_public_apk_use_relocation_packer
66 } 69 }
67 } 70 }
68 } 71 }
69 } 72 }
OLDNEW
« no previous file with comments | « chrome/android/BUILD.gn ('k') | testing/android/proguard_for_test.flags » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698