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

Unified Diff: build/java.gypi

Issue 14476011: [Android] Auto-generate API 14 resources from the existing API 17 resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added copying script action. Pretty much complete I think Created 7 years, 8 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: build/java.gypi
diff --git a/build/java.gypi b/build/java.gypi
index fdcbe576652a7438bd60734f59797f7e171c5215..072ad1b0ac8c15313061a1621fe0f6eed1469716 100644
--- a/build/java.gypi
+++ b/build/java.gypi
@@ -83,6 +83,8 @@
'variables': {
'res_dir': '<(java_in_dir)/res',
'res_crunched_dir': '<(intermediate_dir)/res_crunched',
+ 'res_v14_dir': '<(intermediate_dir)/res_v14',
+ 'res_v17_dir': '<(intermediate_dir)/res_v17',
'res_input_dirs': ['<(res_dir)', '<@(res_extra_dirs)'],
'resource_input_paths': ['<!@(find <(res_dir) -type f)'],
'R_dir': '<(intermediate_dir)/java_R',
@@ -105,7 +107,10 @@
# Dependent APKs include this target's resources via
# additional_res_dirs, additional_res_packages, and
# additional_R_text_files.
- 'additional_res_dirs': ['<(res_crunched_dir)', '<@(res_input_dirs)'],
+ 'additional_res_dirs': ['<(res_crunched_dir)',
+ '<(res_v17_dir)',
+ '<(res_v14_dir)',
+ '<@(res_input_dirs)'],
'additional_res_packages': ['<(R_package)'],
'additional_R_text_files': ['<(R_text_file)'],
},
@@ -148,6 +153,8 @@
'<(DEPTH)/build/android/gyp/process_resources.py',
'>@(resource_input_paths)',
'>@(dependencies_res_files)',
+ '<(res_v14_dir)',
cjhopman 2013/04/26 20:57:31 Having a directory as an input/output doesn't real
Kibeom Kim (inactive) 2013/04/27 00:05:07 Done.
+ '<(res_v17_dir)',
],
'outputs': [
'<(R_stamp)',
@@ -171,6 +178,42 @@
'--ignore=>!(echo \'>(_inputs)\' | md5sum)',
],
},
+ # Copy API 17 resources.
+ {
+ 'action_name': 'copy_api_17_resources_<(_target_name)',
+ 'message': 'Copying Android API 17 resources <(_target_name)',
+ 'inputs': [
+ '<(DEPTH)/build/android/gyp/util/build_utils.py',
+ '<(DEPTH)/build/android/gyp/copy_resources_v17.py',
+ '>@(resource_input_paths)',
+ ],
+ 'outputs': [
+ '<(res_v17_dir)',
cjhopman 2013/04/26 20:57:31 A directory as an output doesn't really work. Use
Kibeom Kim (inactive) 2013/04/27 00:05:07 Done.
+ ],
+ 'action': [
+ 'python', '<(DEPTH)/build/android/gyp/copy_resources_v17.py',
+ '--res-dir=<(res_dir)',
+ '--res-v17-dir=<(res_v17_dir)',
+ ]
+ },
+ # Generate API 14 resources.
+ {
+ 'action_name': 'generate_api_14_resources_<(_target_name)',
+ 'message': 'Generating Android API 14 resources <(_target_name)',
+ 'inputs': [
+ '<(DEPTH)/build/android/gyp/util/build_utils.py',
+ '<(DEPTH)/build/android/gyp/generate_v14_resources.py',
+ '>@(resource_input_paths)',
+ ],
+ 'outputs': [
+ '<(res_v14_dir)',
+ ],
+ 'action': [
+ 'python', '<(DEPTH)/build/android/gyp/generate_v14_resources.py',
+ '--res-dir=<(res_dir)',
+ '--res-v14-dir=<(res_v14_dir)',
+ ]
+ },
],
}],
],
« build/android/gyp/generate_v14_resources.py ('K') | « build/android/gyp/util/build_utils.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698