android_webview/android_webview_tests.gypi - Issue 868673003: [WebView] Repack the .pak files for all the locales.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: android_webview/android_webview_tests.gypi

Issue 868673003: [WebView] Repack the .pak files for all the locales. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 11 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

« android_webview/android_webview_locales_rename_paks.gypi ('K') | « android_webview/android_webview_locales_rename_paks.gypi ('k') | android_webview/apk/system_webview_apk_common.gypi » ('j') | android_webview/tools/webview_locales_rename_paks.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/android_webview_tests.gypi

diff --git a/android_webview/android_webview_tests.gypi b/android_webview/android_webview_tests.gypi

index 7c9043d090a401e5eb0f3934cf9661e03f416f36..dafdf7f2216d2286b61d1a5947f413a432461b9d 100644

--- a/android_webview/android_webview_tests.gypi

+++ b/android_webview/android_webview_tests.gypi

@@ -19,9 +19,11 @@

'resource_dir': 'test/shell/res',

'extensions_to_not_compress': 'pak,dat,bin',

'extra_native_libs': ['<(SHARED_LIB_DIR)/libdrawgl.>(android_product_extension)'],

+ 'android_locales_input_paks_folder': '<(PRODUCT_DIR)/android_webview_assets/',

+ 'android_locales_output_paks_folder': '<(PRODUCT_DIR)/android_webview_apk/assets',

'additional_input_paths': [

+ '<@(android_locales_output_paks)',

'<(PRODUCT_DIR)/android_webview_apk/assets/webviewchromium.pak',

- '<(PRODUCT_DIR)/android_webview_apk/assets/en-US.pak',

'<(PRODUCT_DIR)/android_webview_apk/assets/asset_file.html',

'<(PRODUCT_DIR)/android_webview_apk/assets/cookie_test.html',

'<(PRODUCT_DIR)/android_webview_apk/assets/asset_icon.png',

@@ -49,8 +51,8 @@

{

'destination': '<(PRODUCT_DIR)/android_webview_apk/assets',

'files': [

+ '<@(android_locales_input_paks)',

'<(PRODUCT_DIR)/android_webview_assets/webviewchromium.pak',

- '<(PRODUCT_DIR)/android_webview_assets/en-US.pak',

'<(java_in_dir)/assets/asset_file.html',

'<(java_in_dir)/assets/asset_icon.png',

'<(java_in_dir)/assets/cookie_test.html',

@@ -75,7 +77,10 @@

- 'includes': [ '../build/java_apk.gypi' ],

+ 'includes': [

+ '../build/java_apk.gypi',

+ '../content/android_locales_paks.gypi',

+ ],

{

# android_webview_apk creates a .jar as a side effect. Any java