chrome/chrome.gyp - Issue 12529025: Generate Android string files from generated_resources.grd.

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: chrome/chrome.gyp

Issue 12529025: Generate Android string files from generated_resources.grd. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: flip coin to decide which type of gyp variable expansion to use Created 7 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:

Index: chrome/chrome.gyp

diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp

index c8acc257257e0b9c807917b28ef1931ea66e028f..94407c6012577619526dfb7784ad15f401ae3d5c 100644

--- a/chrome/chrome.gyp

+++ b/chrome/chrome.gyp

@@ -1085,6 +1085,7 @@

'target_name': 'chrome_java',

'type': 'none',

'dependencies': [

+ 'chrome_resources.gyp:chrome_strings',

'profile_sync_service_model_type_selection_java',

'toolbar_model_security_levels_java',

'../base/base.gyp:base',

@@ -1101,6 +1102,9 @@

'R_package': 'org.chromium.chrome',

'R_package_relpath': 'org/chromium/chrome',

'java_strings_grd': 'android_chrome_strings.grd',

+ # Include xml string files generated from generated_resources.grd

+ 'res_extra_dirs': ['<(SHARED_INTERMEDIATE_DIR)/chrome/java/res'],

+ 'res_extra_files': ['<!@pymod_do_main(grit_info <@(grit_defines) --outputs "<(SHARED_INTERMEDIATE_DIR)/chrome" app/generated_resources.grd)'],

'includes': [

'../build/java.gypi',