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

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

Issue 1451483002: [Android] Add gn support for multidex. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: @ Created 5 years, 1 month 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
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("//build/config/android/rules.gni") 5 import("//build/config/android/rules.gni")
6 6
7 declare_args() { 7 declare_args() {
8 # Whether chrome_public_apk should use the crazy linker. 8 # Whether chrome_public_apk should use the crazy linker.
9 chrome_public_apk_use_chromium_linker = true 9 chrome_public_apk_use_chromium_linker = true
10 10
(...skipping 14 matching lines...) Expand all
25 25
26 if (!is_debug) { 26 if (!is_debug) {
27 proguard_enabled = true 27 proguard_enabled = true
28 _prev_proguard_configs = [] 28 _prev_proguard_configs = []
29 if (defined(proguard_configs)) { 29 if (defined(proguard_configs)) {
30 _prev_proguard_configs = proguard_configs 30 _prev_proguard_configs = proguard_configs
31 } 31 }
32 proguard_configs = [] 32 proguard_configs = []
33 proguard_configs = 33 proguard_configs =
34 [ "//chrome/android/java/proguard.flags" ] + _prev_proguard_configs 34 [ "//chrome/android/java/proguard.flags" ] + _prev_proguard_configs
35 } else {
36 multidex = true
agrieve 2015/11/16 19:02:33 super nit: can you flip the clauses so it reads "i
jbudorick 2015/11/16 20:45:56 Done.
35 } 37 }
36 38
37 if (chromium_linker_supported) { 39 if (chromium_linker_supported) {
38 use_chromium_linker = chrome_public_apk_use_chromium_linker 40 use_chromium_linker = chrome_public_apk_use_chromium_linker
39 41
40 # TODO: Enable packed relocations for x64. See: b/20532404 42 # TODO: Enable packed relocations for x64. See: b/20532404
41 if (current_cpu != "x64") { 43 if (current_cpu != "x64") {
42 enable_relocation_packing = chrome_public_apk_use_relocation_packer 44 enable_relocation_packing = chrome_public_apk_use_relocation_packer
43 } 45 }
44 } 46 }
45 } 47 }
46 } 48 }
OLDNEW
« build/config/android/internal_rules.gni ('K') | « build/config/android/rules.gni ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698