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

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

Issue 1435193002: Reland of GN: Enable proguard for apks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix diffbase 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
« no previous file with comments | « chrome/android/BUILD.gn ('k') | no next file » | 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("//build/config/android/rules.gni") 5 import("//build/config/android/rules.gni")
6 6
7 # GYP: //chrome/android/chrome_apk.gypi 7 # GYP: //chrome/android/chrome_apk.gypi
8 template("chrome_public_apk_tmpl") { 8 template("chrome_public_apk_tmpl") {
9 forward_variables_from(invoker, "*") 9 forward_variables_from(invoker, "*")
10 10
11 android_apk(target_name) { 11 android_apk(target_name) {
12 _native_lib_file = 12 _native_lib_file =
13 rebase_path("$root_gen_dir/CHROME_VERSION.json", root_out_dir) 13 rebase_path("$root_gen_dir/CHROME_VERSION.json", root_out_dir)
14 native_lib_version_arg = "@FileArg($_native_lib_file:full-quoted)" 14 native_lib_version_arg = "@FileArg($_native_lib_file:full-quoted)"
15 15
16 # TODO(GYP): 16 if (!is_debug) {
17 #'proguard_enabled': 'true', 17 proguard_enabled = true
18 #'proguard_flags_paths': [ 18 proguard_configs = [ "//chrome/android/java/proguard.flags" ]
19 # 'chrome/android/java/proguard.flags', 19 }
20 #]
21 20
22 if (chromium_linker_supported) { 21 if (chromium_linker_supported) {
23 use_chromium_linker = true 22 use_chromium_linker = true
24 23
25 # TODO: Enable packed relocations for x64. See: b/20532404 24 # TODO: Enable packed relocations for x64. See: b/20532404
26 if (current_cpu != "x64") { 25 if (current_cpu != "x64") {
27 enable_relocation_packing = true 26 enable_relocation_packing = true
28 } 27 }
29 } 28 }
30 } 29 }
31 } 30 }
OLDNEW
« no previous file with comments | « chrome/android/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698