trunk/src/chrome/chrome_repack_locales.gypi - Issue 383373002: Revert 282837 because it broke non-chromeos builds.

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: trunk/src/chrome/chrome_repack_locales.gypi

Issue 383373002: Revert 282837 because it broke non-chromeos builds. (Closed) Base URL: svn://svn.chromium.org/chrome/

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

Index: trunk/src/chrome/chrome_repack_locales.gypi

===================================================================

--- trunk/src/chrome/chrome_repack_locales.gypi (revision 282838)

+++ trunk/src/chrome/chrome_repack_locales.gypi (working copy)

@@ -14,16 +14,11 @@

}, { # else: branding!="Chrome"

'branding_flag': ['-b', 'chromium',],

}],

- ['chromeos==1', {

- 'chromeos_flag': ['--chromeos'],

- }, {

- 'chromeos_flag': [''],

- }],

'inputs': [

'<(repack_locales_path)',

- '<!@pymod_do_main(repack_locales -i -p <(OS) <(branding_flag) -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) --use-ash <(use_ash) <(chromeos_flag) --enable-autofill-dialog <(enable_autofill_dialog) <(pak_locales))'

+ '<!@pymod_do_main(repack_locales -i -p <(OS) <(branding_flag) -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) --use-ash <(use_ash) --enable-autofill-dialog <(enable_autofill_dialog) <(pak_locales))'

'outputs': [

'<!@pymod_do_main(repack_locales -o -p <(OS) -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(pak_locales))'

@@ -37,7 +32,6 @@

'-s', '<(SHARED_INTERMEDIATE_DIR)',

'-x', '<(SHARED_INTERMEDIATE_DIR)/.',

'--use-ash=<(use_ash)',

- '<@(chromeos_flag)',

'--enable-autofill-dialog=<(enable_autofill_dialog)',

'<@(repack_options)',

'<@(pak_locales)',

« no previous file with comments | « trunk/src/chrome/chrome_repack_chrome_200_percent.gypi ('k') | trunk/src/chrome/chrome_resources.gyp » ('j') | no next file with comments »