diff options
| author | shashishekhar@chromium.org <shashishekhar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 19:07:14 +0000 |
|---|---|---|
| committer | shashishekhar@chromium.org <shashishekhar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 19:07:14 +0000 |
| commit | 0d9d63508eea8bdc3607d1d8fc4f0659c36c8f60 (patch) | |
| tree | dcf5420ba45663a8122c0299a0f6629338f30e35 /build | |
| parent | d853ff29994ab1f1a3d2d2d6c71646b260697e98 (diff) | |
| download | chromium_src-0d9d63508eea8bdc3607d1d8fc4f0659c36c8f60.zip chromium_src-0d9d63508eea8bdc3607d1d8fc4f0659c36c8f60.tar.gz chromium_src-0d9d63508eea8bdc3607d1d8fc4f0659c36c8f60.tar.bz2 | |
Make resource directory option in gyp template optional.
Resource directory may not always be defined for an apk, make it optional.
BUG=156061
Review URL: https://chromiumcodereview.appspot.com/11189010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162477 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/java_apk.gypi | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/build/java_apk.gypi b/build/java_apk.gypi index 0973f8d..cec4137 100644 --- a/build/java_apk.gypi +++ b/build/java_apk.gypi @@ -33,7 +33,6 @@ # apk_name - The final apk will be named <apk_name>-debug.apk (or -release) # java_in_dir - The top-level java directory. The src should be in # <java_in_dir>/src. -# resource_dir - The directory for resources. # Optional/automatic variables: # additional_input_paths - These paths will be included in the 'inputs' list to # ensure that this target is rebuilt when one of these paths changes. @@ -52,6 +51,7 @@ # the library will be included in the apk and symbolic links to the # unstripped copy will be added to <(android_product_out) to enable native # debugging. +# resource_dir - The directory for resources. { 'variables': { @@ -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!=""', { + '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. |