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

Unified Diff: chrome/android/chrome_public_apk_tmpl.gni

Issue 1553663002: Only use value of chrome_public_apk_use_chromium_linker if use_chromium_linker is not set. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | 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 26ae9fc735d711508cc1d22152401b9d4bfd0c99..57974ef42b26ac3131025d37cd0bb4fe6f9535d8 100644
--- a/chrome/android/chrome_public_apk_tmpl.gni
+++ b/chrome/android/chrome_public_apk_tmpl.gni
@@ -37,7 +37,9 @@ template("chrome_public_apk_tmpl") {
}
if (chromium_linker_supported) {
- use_chromium_linker = chrome_public_apk_use_chromium_linker
+ if (!defined(use_chromium_linker)) {
+ use_chromium_linker = chrome_public_apk_use_chromium_linker
+ }
# TODO: Enable packed relocations for x64. See: b/20532404
if (current_cpu != "x64") {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698