| 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") {
|
|
|