Chromium Code Reviews| Index: build/java.gypi |
| diff --git a/build/java.gypi b/build/java.gypi |
| index f3d9798f5b01941ee5c8373288996c345672ea83..91db8165874bfc90a4e6e64c25836be56ab2b840 100644 |
| --- a/build/java.gypi |
| +++ b/build/java.gypi |
| @@ -26,18 +26,26 @@ |
| # |
| # Finally, the generated jar-file will be: |
| # <(PRODUCT_DIR)/lib.java/chromium_base.jar |
| -# |
| -# TODO(yfriedman): The "finally" statement isn't entirely true yet, as we don't |
| -# auto-generate the ant file yet. |
| { |
| + 'direct_dependent_settings': { |
|
Yaron
2012/08/07 16:41:09
This seems to work as-is but I wonder if we'd ulti
cjhopman
2012/08/07 19:12:11
So, I've changed it to all_dependent_settings.
L
Ryan Sleevi
2012/08/08 05:47:47
This is indeed the correct and preferred way.
I'm
|
| + 'variables': { |
| + 'input_jars_paths': ['<(PRODUCT_DIR)/lib.java/chromium_<(package_name).jar'], |
| + }, |
| + }, |
| + 'variables': { |
| + 'input_jars_paths': [], |
| + }, |
| 'actions': [ |
| { |
| 'action_name': 'ant_<(package_name)', |
| 'message': 'Building <(package_name) java sources.', |
| 'inputs': [ |
| - '<(java_in_dir)/<(package_name).xml', |
| - '<!@(find <(java_in_dir) -name "*.java")' |
| + 'android/ant/common.xml', |
| + 'android/ant/chromium-jars.xml', |
| + '<(java_in_dir)/<(package_name).xml', |
| + '<!@(find <(java_in_dir) -name "*.java")', |
| + '>@(input_jars_paths)', |
| ], |
| 'outputs': [ |
| '<(PRODUCT_DIR)/lib.java/chromium_<(package_name).jar', |