Chromium Code Reviews| Index: build/java_apk.gypi |
| diff --git a/build/java_apk.gypi b/build/java_apk.gypi |
| index 0973f8dbba2df85dccbc0c2f5e9f70afcf43891c..0fab9c5aea190ed36caeb9290e263b4cb59f7083 100644 |
| --- a/build/java_apk.gypi |
| +++ b/build/java_apk.gypi |
| @@ -66,6 +66,7 @@ |
| 'proguard_flags%': '', |
| 'native_libs_paths': [], |
| 'manifest_package_name%': 'unknown.package.name', |
| + 'resource_dir%':'', |
| }, |
| 'sources': [ |
| '<@(native_libs_paths)' |
| @@ -106,11 +107,15 @@ |
| # If there is a separate find for additional_src_dirs, it will find the |
| # wrong .java files when additional_src_dirs is empty. |
| '>!@(find >(java_in_dir) >(additional_src_dirs) -name "*.java")', |
| - '<!@(find <(java_in_dir)/<(resource_dir) -name "*")', |
| '>@(input_jars_paths)', |
| '>@(native_libs_paths)', |
| '>@(additional_input_paths)', |
| ], |
| + 'conditions': [ |
| + ['"<(resource_dir)"!=""', { |
|
cjhopman
2012/10/16 22:31:12
I think this can be changed to:
['resource_dir!="
shashi
2012/10/16 22:38:51
Thanks, much better.
On 2012/10/16 22:31:12, cjhop
|
| + 'inputs': ['<!@(find <(java_in_dir)/<(resource_dir) -name "*")'] |
| + }], |
| + ], |
| 'outputs': [ |
| # TODO(cjhopman): Apks are built with a -debug suffix even when they are |
| # built in release. This should be fixed. |