Chromium Code Reviews| Index: android_webview/apk/system_webview_apk_common.gypi |
| diff --git a/android_webview/apk/system_webview_apk_common.gypi b/android_webview/apk/system_webview_apk_common.gypi |
| index 94c730c168023fc45b2387f3279591ebfb28b4cf..b50f7c910aae0a3e8c9e2ca74d675b4d62d2f633 100644 |
| --- a/android_webview/apk/system_webview_apk_common.gypi |
| +++ b/android_webview/apk/system_webview_apk_common.gypi |
| @@ -20,6 +20,12 @@ |
| 'extensions_to_not_compress': 'pak,bin,dat', |
| 'asset_location': '<(INTERMEDIATE_DIR)/assets/', |
| 'snapshot_copy_files': '<(snapshot_copy_files)', |
| + 'jinja_inputs': ['<(android_manifest_template_path)'], |
| + 'jinja_output': '<(INTERMEDIATE_DIR)/AndroidManifest.xml', |
| + 'jinja_variables': [ '<@(android_manifest_template_vars)' ], |
| + 'android_manifest_template_vars': [ ], |
| + 'android_manifest_template_path': '<(DEPTH)/android_webview/apk/java/AndroidManifest.xml', |
|
hush (inactive)
2015/03/30 23:47:19
I guess this probably overrides the AndroidManifes
|
| + 'android_manifest_path': '<(jinja_output)', |
| # TODO: crbug.com/442348 Update proguard.flags and re-enable. |
| 'proguard_enabled': 'false', |
| 'proguard_flags_paths': ['<(DEPTH)/android_webview/apk/java/proguard.flags'], |
| @@ -81,5 +87,6 @@ |
| 'includes': [ |
| 'system_webview_locales_paks.gypi', |
| '../../build/java_apk.gypi', |
| + '../../build/android/jinja_template.gypi', |
| ], |
| } |