Chromium Code Reviews| Index: android_webview/android_webview.gyp |
| diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp |
| index f20c3be27b995af7f04e2e62a32e17df39b7be2f..72333881fa4a1ccc9dcf71eda013b3eb67625a1b 100644 |
| --- a/android_webview/android_webview.gyp |
| +++ b/android_webview/android_webview.gyp |
| @@ -388,11 +388,17 @@ |
| 'variables': { |
| 'apk_name': 'SystemWebView', |
| 'android_sdk_jar': '../third_party/android_platform/webview/frameworks_5.1.0_r1.jar', |
| - 'android_manifest_path': 'apk/java/AndroidManifest.xml', |
| + 'jinja_inputs': ['apk/java/AndroidManifest.xml'], |
|
Torne
2015/03/30 13:31:09
Thinking about it more, all this logic should go i
Tobias Sargeant
2015/03/30 13:53:07
Done.
|
| + 'jinja_output': '<(INTERMEDIATE_DIR)/AndroidManifest.xml', |
| + 'jinja_variables': [ ], |
| + 'android_manifest_path': '<(INTERMEDIATE_DIR)/AndroidManifest.xml', |
| 'java_in_dir': 'glue/java', |
| 'resource_dir': 'apk/java/res', |
| }, |
| - 'includes': [ 'apk/system_webview_apk_common.gypi' ], |
| + 'includes': [ |
| + 'apk/system_webview_apk_common.gypi', |
| + '../build/android/jinja_template.gypi', |
| + ], |
| }, |
| ], |
| }, { # android_webview_build==1 |