Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

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

Issue 29684695: Issue 6287 - Create codename Orca v.0 to launch internally to the team (Closed)
Patch Set: Added link to issue and adjusted versionName Created Feb. 1, 2018, 8:51 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
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("//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/android/version.gni")
7 import("//build/config/locales.gni") 8 import("//build/config/locales.gni")
8 import("//chrome/common/features.gni") 9 import("//chrome/common/features.gni")
9 import("//third_party/leakcanary/config.gni") 10 import("//third_party/leakcanary/config.gni")
10 import("channel.gni") 11 import("channel.gni")
11 12
12 declare_args() { 13 declare_args() {
13 # Whether chrome_public_apk should use the crazy linker. 14 # Whether chrome_public_apk should use the crazy linker.
14 chrome_public_apk_use_chromium_linker = chromium_linker_supported 15 chrome_public_apk_use_chromium_linker = chromium_linker_supported
15 16
16 # Whether chrome_public_apk should use the relocation packer. 17 # Whether chrome_public_apk should use the relocation packer.
17 chrome_public_apk_use_relocation_packer = chromium_linker_supported 18 chrome_public_apk_use_relocation_packer = chromium_linker_supported
18 19
19 # Whether native libraries should be loaded from within the apk. 20 # Whether native libraries should be loaded from within the apk.
20 # Only attempt loading the library from the APK for 64 bit devices 21 # Only attempt loading the library from the APK for 64 bit devices
21 # until the number of 32 bit devices which don't support this 22 # until the number of 32 bit devices which don't support this
22 # approach falls to a minimal level - http://crbug.com/390618. 23 # approach falls to a minimal level - http://crbug.com/390618.
23 chrome_public_apk_load_library_from_apk = 24 chrome_public_apk_load_library_from_apk =
24 chromium_linker_supported && 25 chromium_linker_supported &&
25 (current_cpu == "arm64" || current_cpu == "x64") 26 (current_cpu == "arm64" || current_cpu == "x64")
26 27
27 # Enables ProGuard obfuscation of Chromium packages. 28 # Enables ProGuard obfuscation of Chromium packages.
28 enable_proguard_obfuscation = false 29 enable_proguard_obfuscation = false
29 30
30 # Enables ProGuard obfuscation of chrome_public_test_apk. 31 # Enables ProGuard obfuscation of chrome_public_test_apk.
31 enable_proguard_obfuscation_for_tests = false 32 enable_proguard_obfuscation_for_tests = false
32 33
33 # Enable multidex in release builds. 34 # Enable multidex in release builds.
34 multidex_in_release = false 35 multidex_in_release = false
36
37 # Set versionName for AndroidManifest.xml. See https://issues.adblockplus.org/ ticket/6287
38 version_name = android_version_name
39
40 # Set versionCode for AndroidManifest.xml. See https://issues.adblockplus.org/ ticket/6287
41 version_code = android_version_code
35 } 42 }
36 43
37 default_chrome_public_jinja_variables = [ 44 default_chrome_public_jinja_variables = [
38 "channel=$android_channel", 45 "channel=$android_channel",
39 "enable_leakcanary=$enable_leakcanary", 46 "enable_leakcanary=$enable_leakcanary",
40 "enable_vr=$enable_vr", 47 "enable_vr=$enable_vr",
41 ] 48 ]
42 49
43 template("chrome_public_apk_tmpl") { 50 template("chrome_public_apk_tmpl") {
44 android_apk(target_name) { 51 android_apk(target_name) {
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 152
146 if (!is_java_debug) { 153 if (!is_java_debug) {
147 if (!defined(proguard_configs)) { 154 if (!defined(proguard_configs)) {
148 proguard_configs = [] 155 proguard_configs = []
149 } 156 }
150 proguard_configs += [ "//android_webview/apk/java/proguard.flags" ] 157 proguard_configs += [ "//android_webview/apk/java/proguard.flags" ]
151 png_to_webp = true 158 png_to_webp = true
152 } 159 }
153 } 160 }
154 } 161 }
OLDNEW

Powered by Google App Engine
This is Rietveld