Chromium Code Reviews| Index: android_webview/system_webview_apk_tmpl.gni |
| diff --git a/android_webview/system_webview_apk_tmpl.gni b/android_webview/system_webview_apk_tmpl.gni |
| index 0667b9e8939ed90950896c14e004fe6fb23ab6cf..45d23f225517e030f008c24c6192f0943432dd1b 100644 |
| --- a/android_webview/system_webview_apk_tmpl.gni |
| +++ b/android_webview/system_webview_apk_tmpl.gni |
| @@ -26,6 +26,12 @@ template("system_webview_apk_tmpl") { |
| native_lib_version_arg = "@FileArg($_native_lib_file:full-quoted)" |
| extensions_to_not_compress = ".lpak,.pak,.bin,.dat" |
| + if ((!defined(merge_64bit_webview) || !merge_64bit_webview) && |
|
Torne
2016/09/12 12:43:42
Am I interepreting this correctly that setting mer
michaelbai
2016/09/12 19:41:13
It seemed merge_64bit_webview is not a good name,
|
| + android_64bit_target_cpu) { |
| + secondary_abi_shared_libraries = |
| + [ "//android_webview:webviewchromium_secondary_abi_lib" ] |
| + } |
| + |
| if (!is_java_debug) { |
| proguard_enabled = true |
| if (!defined(proguard_configs)) { |