| Index: build/android/developer_recommended_flags.gypi
|
| diff --git a/build/android/developer_recommended_flags.gypi b/build/android/developer_recommended_flags.gypi
|
| index 220a623e96bfdfc92cf3c218af24e43180f8c567..3a3db0a3138c205e2a918cff0f0a5b9d168036a6 100644
|
| --- a/build/android/developer_recommended_flags.gypi
|
| +++ b/build/android/developer_recommended_flags.gypi
|
| @@ -13,10 +13,10 @@
|
| # and you'll get new settings automatically.
|
| # When using this method, you can override individual settings by setting them unconditionally (with
|
| # no %) in chrome/supplement.gypi.
|
| -# I.e. to disable optimize_jni_generation but use everything else:
|
| +# I.e. to disable gyp_managed_install but use everything else:
|
| # {
|
| # 'variables': {
|
| -# 'optimize_jni_generation': 0,
|
| +# 'gyp_managed_install': 0,
|
| # },
|
| # 'includes': [ '../build/android/developer_recommended_flags.gypi' ]
|
| # }
|
| @@ -31,10 +31,6 @@
|
| },
|
| 'component%': '<(component)',
|
|
|
| - # When set to 1, only write jni generated files if they've changed. This can prevent unnecessary
|
| - # compiling/linking of native libraries when editing java files.
|
| - 'optimize_jni_generation%': 1,
|
| -
|
| # When gyp_managed_install is set to 1, building an APK will install that APK on the connected
|
| # device(/emulator). To install on multiple devices (or onto a new device), build the APK once
|
| # with each device attached. This greatly reduces the time required for incremental builds.
|
|
|