Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2860)

Unified Diff: android_webview/apk/system_webview_apk_common.gypi

Issue 1193613002: Convert Android WebView to store locale .pak files as res/raw resources (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@no-extractor-init
Patch Set: rebase again Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « android_webview/android_webview_tests.gypi ('k') | android_webview/apk/system_webview_locales_paks.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 b50f7c910aae0a3e8c9e2ca74d675b4d62d2f633..9739ae0b781196c911d652bb351a6286d67c335b 100644
--- a/android_webview/apk/system_webview_apk_common.gypi
+++ b/android_webview/apk/system_webview_apk_common.gypi
@@ -17,7 +17,7 @@
'R_package': 'com.android.webview.chromium',
'R_package_relpath': 'com/android/webview/chromium',
'shared_resources': 1,
- 'extensions_to_not_compress': 'pak,bin,dat',
+ 'extensions_to_not_compress': '.lpak,.pak,.bin,.dat',
'asset_location': '<(INTERMEDIATE_DIR)/assets/',
'snapshot_copy_files': '<(snapshot_copy_files)',
'jinja_inputs': ['<(android_manifest_template_path)'],
@@ -31,7 +31,6 @@
'proguard_flags_paths': ['<(DEPTH)/android_webview/apk/java/proguard.flags'],
# TODO: crbug.com/405035 Find a better solution for WebView .pak files.
'additional_input_paths': [
- '<@(webview_locales_output_paks)',
'<(asset_location)/webviewchromium.pak',
'<(asset_location)/webview_licenses.notice',
'<@(snapshot_additional_input_paths)',
@@ -51,7 +50,6 @@
{
'destination': '<(asset_location)',
'files': [
- '<@(webview_locales_input_paks)',
'<(PRODUCT_DIR)/android_webview_assets/webviewchromium.pak',
'<@(snapshot_copy_files)',
],
@@ -85,7 +83,6 @@
},
],
'includes': [
- 'system_webview_locales_paks.gypi',
'../../build/java_apk.gypi',
'../../build/android/jinja_template.gypi',
],
« no previous file with comments | « android_webview/android_webview_tests.gypi ('k') | android_webview/apk/system_webview_locales_paks.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698