diff options
| author | tobiasjs <tobiasjs@chromium.org> | 2015-03-30 09:33:46 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-30 16:34:26 +0000 |
| commit | 846177a22c453c33f867d9c4a9f14c80f7f30372 (patch) | |
| tree | 955a73051407be0e3c42b5078a83c32575fdca94 /android_webview | |
| parent | 5b765e212deadb4eab31cf0594dbd07bc1979b05 (diff) | |
| download | chromium_src-846177a22c453c33f867d9c4a9f14c80f7f30372.zip chromium_src-846177a22c453c33f867d9c4a9f14c80f7f30372.tar.gz chromium_src-846177a22c453c33f867d9c4a9f14c80f7f30372.tar.bz2 | |
Use jinja2 to template webview manifest files.
BUG=
Review URL: https://codereview.chromium.org/1048463003
Cr-Commit-Position: refs/heads/master@{#322791}
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/android_webview.gyp | 1 | ||||
| -rw-r--r-- | android_webview/apk/java/AndroidManifest.xml | 6 | ||||
| -rw-r--r-- | android_webview/apk/system_webview_apk_common.gypi | 7 |
3 files changed, 10 insertions, 4 deletions
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp index f20c3be..afd8a46 100644 --- a/android_webview/android_webview.gyp +++ b/android_webview/android_webview.gyp @@ -388,7 +388,6 @@ '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', 'java_in_dir': 'glue/java', 'resource_dir': 'apk/java/res', }, diff --git a/android_webview/apk/java/AndroidManifest.xml b/android_webview/apk/java/AndroidManifest.xml index 76d14a3..b601a23 100644 --- a/android_webview/apk/java/AndroidManifest.xml +++ b/android_webview/apk/java/AndroidManifest.xml @@ -8,9 +8,9 @@ <!-- Please keep this in sync with the downstream android_webview manifest. --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.android.webview"> - <uses-sdk android:minSdkVersion="21" - android:targetSdkVersion="21"> + package="{{package|default('com.android.webview')}}"> + <uses-sdk android:minSdkVersion="{{minsdk|default(21)}}" + android:targetSdkVersion="{{targetsdk|default(21)}}"> </uses-sdk> <uses-feature android:name="android.hardware.touchscreen" diff --git a/android_webview/apk/system_webview_apk_common.gypi b/android_webview/apk/system_webview_apk_common.gypi index 94c730c..b50f7c9 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', + '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', ], } |