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

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

Issue 2615753004: Android: Stop including unsupport locales in resources.arsc (Closed)
Patch Set: always keep non-regional language configs Created 3 years, 11 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') | 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("//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("//build/config/locales.gni")
7 import("//chrome/common/features.gni") 8 import("//chrome/common/features.gni")
8 import("//third_party/leakcanary/config.gni") 9 import("//third_party/leakcanary/config.gni")
9 import("channel.gni") 10 import("channel.gni")
10 11
11 declare_args() { 12 declare_args() {
12 # Whether chrome_public_apk should use the crazy linker. 13 # Whether chrome_public_apk should use the crazy linker.
13 chrome_public_apk_use_chromium_linker = chromium_linker_supported 14 chrome_public_apk_use_chromium_linker = chromium_linker_supported
14 15
15 # Whether chrome_public_apk should use the relocation packer. 16 # Whether chrome_public_apk should use the relocation packer.
16 chrome_public_apk_use_relocation_packer = chromium_linker_supported 17 chrome_public_apk_use_relocation_packer = chromium_linker_supported
(...skipping 17 matching lines...) Expand all
34 "enable_webvr=$enable_webvr", 35 "enable_webvr=$enable_webvr",
35 ] 36 ]
36 37
37 template("chrome_public_apk_tmpl") { 38 template("chrome_public_apk_tmpl") {
38 android_apk(target_name) { 39 android_apk(target_name) {
39 forward_variables_from(invoker, "*") 40 forward_variables_from(invoker, "*")
40 _native_lib_file = 41 _native_lib_file =
41 rebase_path("$root_gen_dir/CHROME_VERSION.json", root_out_dir) 42 rebase_path("$root_gen_dir/CHROME_VERSION.json", root_out_dir)
42 native_lib_version_arg = "@FileArg($_native_lib_file:full-quoted)" 43 native_lib_version_arg = "@FileArg($_native_lib_file:full-quoted)"
43 native_lib_version_rule = "//build/util:chrome_version_json" 44 native_lib_version_rule = "//build/util:chrome_version_json"
45 aapt_locale_whitelist = locales - android_chrome_omitted_locales
michaelbai 2017/01/05 22:41:40 Did this remove the locales supported by WebView i
44 46
45 if (is_java_debug) { 47 if (is_java_debug) {
46 enable_multidex = true 48 enable_multidex = true
47 } else { 49 } else {
48 proguard_enabled = true 50 proguard_enabled = true
49 if (!defined(proguard_configs)) { 51 if (!defined(proguard_configs)) {
50 proguard_configs = [] 52 proguard_configs = []
51 } 53 }
52 proguard_configs += [ 54 proguard_configs += [
53 "//chrome/android/java/proguard.flags", 55 "//chrome/android/java/proguard.flags",
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 ] 121 ]
120 122
121 if (!is_java_debug) { 123 if (!is_java_debug) {
122 if (!defined(proguard_configs)) { 124 if (!defined(proguard_configs)) {
123 proguard_configs = [] 125 proguard_configs = []
124 } 126 }
125 proguard_configs += [ "//android_webview/apk/java/proguard.flags" ] 127 proguard_configs += [ "//android_webview/apk/java/proguard.flags" ]
126 } 128 }
127 } 129 }
128 } 130 }
OLDNEW
« no previous file with comments | « build/config/android/rules.gni ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698