diff options
Diffstat (limited to 'chrome/android/chrome_apk.gyp')
| -rw-r--r-- | chrome/android/chrome_apk.gyp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/chrome/android/chrome_apk.gyp b/chrome/android/chrome_apk.gyp index e1cf10c..e92491d 100644 --- a/chrome/android/chrome_apk.gyp +++ b/chrome/android/chrome_apk.gyp @@ -204,9 +204,8 @@ # Only attempt loading the library from the APK for 64 bit devices # until the number of 32 bit devices which don't support this # approach falls to a minimal level - http://crbug.com/390618. - ['component != "shared_library" and profiling==0 and (target_arch == "arm64" or target_arch == "x86_64")', { - 'load_library_from_zip_file': '<(chrome_apk_load_library_from_zip)', - 'load_library_from_zip': '<(chrome_apk_load_library_from_zip)', + ['chrome_apk_use_chromium_linker==1 and profiling==0 and (target_arch == "arm64" or target_arch == "x86_64")', { + 'load_library_from_zip': 1, }], ], }, @@ -243,9 +242,8 @@ # Only attempt loading the library from the APK for 64 bit devices # until the number of 32 bit devices which don't support this # approach falls to a minimal level - http://crbug.com/390618. - ['component != "shared_library" and profiling==0 and (target_arch == "arm64" or target_arch == "x86_64")', { - 'load_library_from_zip_file': '<(chrome_apk_load_library_from_zip)', - 'load_library_from_zip': '<(chrome_apk_load_library_from_zip)', + ['chrome_apk_use_chromium_linker==1 and profiling==0 and (target_arch == "arm64" or target_arch == "x86_64")', { + 'load_library_from_zip': 1, }], ], }, |