trunk/src/chrome/chrome_android_paks.gypi - Issue 183863005: Revert 253938 "Enable icu_use_data_file_flag on Android"

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: trunk/src/chrome/chrome_android_paks.gypi

Issue 183863005: Revert 253938 "Enable icu_use_data_file_flag on Android" (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 years, 9 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « trunk/src/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellApplication.java ('k') | trunk/src/content/content.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 # Use of this source code is governed by a BSD-style license that can be	2 # Use of this source code is governed by a BSD-style license that can be

3 # found in the LICENSE file.	3 # found in the LICENSE file.

4 {	4 {

5 'variables': {	5 'variables': {

6 'chrome_android_pak_output_folder': '<@(PRODUCT_DIR)/../assets/<(package_nam e)',	6 'chrome_android_pak_output_folder': '<@(PRODUCT_DIR)/../assets/<(package_nam e)',

7 'chrome_android_pak_input_resources': [	7 'chrome_android_pak_input_resources': [

8 '<(PRODUCT_DIR)/resources.pak',	8 '<(PRODUCT_DIR)/resources.pak',

9 '<(PRODUCT_DIR)/chrome_100_percent.pak',	9 '<(PRODUCT_DIR)/chrome_100_percent.pak',

10 '<(PRODUCT_DIR)/locales/am.pak',	10 '<(PRODUCT_DIR)/locales/am.pak',

(...skipping 82 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
93 '<(chrome_android_pak_output_folder)/sr.pak',	93 '<(chrome_android_pak_output_folder)/sr.pak',

94 '<(chrome_android_pak_output_folder)/sv.pak',	94 '<(chrome_android_pak_output_folder)/sv.pak',

95 '<(chrome_android_pak_output_folder)/sw.pak',	95 '<(chrome_android_pak_output_folder)/sw.pak',

96 '<(chrome_android_pak_output_folder)/th.pak',	96 '<(chrome_android_pak_output_folder)/th.pak',

97 '<(chrome_android_pak_output_folder)/tr.pak',	97 '<(chrome_android_pak_output_folder)/tr.pak',

98 '<(chrome_android_pak_output_folder)/uk.pak',	98 '<(chrome_android_pak_output_folder)/uk.pak',

99 '<(chrome_android_pak_output_folder)/vi.pak',	99 '<(chrome_android_pak_output_folder)/vi.pak',

100 '<(chrome_android_pak_output_folder)/zh-CN.pak',	100 '<(chrome_android_pak_output_folder)/zh-CN.pak',

101 '<(chrome_android_pak_output_folder)/zh-TW.pak',	101 '<(chrome_android_pak_output_folder)/zh-TW.pak',

102 ],	102 ],

103 'conditions': [

104 ['icu_use_data_file_flag==1', {

105 'chrome_android_pak_input_resources': [

106 '<(PRODUCT_DIR)/icudtl.dat',

107 ],

108 'chrome_android_pak_output_resources': [

109 '<(chrome_android_pak_output_folder)/icudtl.dat',

110 ],

111 }],

112 ],

113 },	103 },

114 }	104 }

115	105

OLD	NEW