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

Unified 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: Fixed comments Created Feb. 2, 2018, 12:50 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/android/BUILD.gn ('k') | chrome/android/java/res_orca/drawable-hdpi/fre_product_logo.png » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/chrome_public_apk_tmpl.gni
diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni
index e2905197170e1e7fb33248924ac5c2285fb40c03..db2bba8f48d677e7d5ed93744ba10ad2b549404e 100644
--- a/chrome/android/chrome_public_apk_tmpl.gni
+++ b/chrome/android/chrome_public_apk_tmpl.gni
@@ -4,6 +4,7 @@
import("//base/android/linker/config.gni")
import("//build/config/android/rules.gni")
+import("//build/config/android/version.gni")
import("//build/config/locales.gni")
import("//chrome/common/features.gni")
import("//third_party/leakcanary/config.gni")
@@ -32,6 +33,12 @@ declare_args() {
# Enable multidex in release builds.
multidex_in_release = false
+
+ # Set versionName for AndroidManifest.xml. See https://issues.adblockplus.org/ticket/6287
+ version_name = android_version_name
+
+ # Set versionCode for AndroidManifest.xml. See https://issues.adblockplus.org/ticket/6287
+ version_code = android_version_code
}
default_chrome_public_jinja_variables = [
« no previous file with comments | « chrome/android/BUILD.gn ('k') | chrome/android/java/res_orca/drawable-hdpi/fre_product_logo.png » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld