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

Issues Search
    My Issues | Starred     Open | Closed | All

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: renamed strings.xml files 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:
View side-by-side diff with in-line comments
Download patch
« build/android/process_resources.py ('K') | « chrome/app/generated_resources.grd ('k') | content/public/android/java/strings/android_content_strings.grd » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome.gyp
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 295c79ae5d67f63a12102af53c0c082232050e1a..887651171a5ceca1553247b27a6a84938a6252e9 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',
« build/android/process_resources.py ('K') | « chrome/app/generated_resources.grd ('k') | content/public/android/java/strings/android_content_strings.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698