OLD | NEW |
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 asset_location = "$root_build_dir/chrome_public_apk_assets" | 12 asset_location = "$root_build_dir/chrome_public_apk_assets" |
13 _native_lib_file = | 13 _native_lib_file = |
14 rebase_path("$root_gen_dir/CHROME_VERSION.json", root_out_dir) | 14 rebase_path("$root_gen_dir/CHROME_VERSION.json", root_out_dir) |
15 native_lib_version_arg = "@FileArg($_native_lib_file:full-quoted)" | 15 native_lib_version_arg = "@FileArg($_native_lib_file:full-quoted)" |
16 | 16 |
17 if (!is_debug) { | 17 # TODO(GYP): |
18 proguard_enabled = true | 18 #'proguard_enabled': 'true', |
19 proguard_configs = [ "//chrome/android/java/proguard.flags" ] | 19 #'proguard_flags_paths': [ |
20 } | 20 # 'chrome/android/java/proguard.flags', |
| 21 #] |
21 | 22 |
22 if (chromium_linker_supported) { | 23 if (chromium_linker_supported) { |
23 use_chromium_linker = true | 24 use_chromium_linker = true |
24 | 25 |
25 # TODO: Enable packed relocations for x64. See: b/20532404 | 26 # TODO: Enable packed relocations for x64. See: b/20532404 |
26 if (current_cpu != "x64") { | 27 if (current_cpu != "x64") { |
27 enable_relocation_packing = true | 28 enable_relocation_packing = true |
28 } | 29 } |
29 } | 30 } |
30 } | 31 } |
31 } | 32 } |
OLD | NEW |