Chromium Code Reviews| Index: build/config/android/config.gni |
| diff --git a/build/config/android/config.gni b/build/config/android/config.gni |
| index 6a16eb2d68bc82f3c147fcd0ec9e2c2247297525..a36fd3dae6f90b7f4b3b221e60c746b03877e607 100644 |
| --- a/build/config/android/config.gni |
| +++ b/build/config/android/config.gni |
| @@ -133,6 +133,10 @@ if (is_android) { |
| # Adds intrumentation to each function. Writes a file with the order that |
| # functions are called at startup. |
| use_order_profiling = false |
| + |
| + # Only build 64-bit binaries in 64-bit WebView APK. 32-bit apps will not be |
| + # supported; for development only. |
| + build_64bit_only_webview = false |
|
jbudorick
2016/09/16 16:23:35
As this is webview-specific, it seems like it shou
Torne
2016/09/16 16:37:57
It'll also have an effect on the monochrome APK.
michaelbai
2016/09/16 20:05:55
Since there are 2 separated variable, this one is
|
| } |
| # We need a second declare_args block to make sure we are using the overridden |
| @@ -142,6 +146,11 @@ if (is_android) { |
| enable_incremental_dx = is_java_debug |
| } |
| + if (defined(merge_64bit_webview_and_monochrome) && |
|
jbudorick
2016/09/16 16:23:35
I agree with torne -- this should be defined upstr
|
| + merge_64bit_webview_and_monochrome) { |
| + build_64bit_only_webview = true |
| + } |
| + |
| # Neither of these should ever be used for release builds since they are |
| # somewhat experimental and dx --incremental is known to not produce |
| # byte-for-byte identical output. |