diff options
| author | cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-09 18:08:19 +0000 |
|---|---|---|
| committer | cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-09 18:08:19 +0000 |
| commit | efdbdb05c0a56ef6c9d23a78e1586bdc733cb504 (patch) | |
| tree | 3a41fb5c949daf242749f0a415955f375b994a1b /build/apk_test.gypi | |
| parent | 70e5fe7ce5c2731412fda48ec9c0c554cfece7d4 (diff) | |
| download | chromium_src-efdbdb05c0a56ef6c9d23a78e1586bdc733cb504.zip chromium_src-efdbdb05c0a56ef6c9d23a78e1586bdc733cb504.tar.gz chromium_src-efdbdb05c0a56ef6c9d23a78e1586bdc733cb504.tar.bz2 | |
Make java.gypi export jar path to input_jars_paths variable
Both java.gypi and apk_test.gypi expect the jar path in
input_jars_paths. This means that we were specifying the dependence in
both 'dependencies' and 'input_jars_paths'. This change makes it so that
we don't need that redundancy.
Also, make java.gypi use input_jars_paths in its input so that we
actually rebuild targets when we should.
BUG=136756
Review URL: https://chromiumcodereview.appspot.com/10837143
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150850 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/apk_test.gypi')
| -rw-r--r-- | build/apk_test.gypi | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/build/apk_test.gypi b/build/apk_test.gypi index bd74105..519e789 100644 --- a/build/apk_test.gypi +++ b/build/apk_test.gypi @@ -19,6 +19,9 @@ # { + 'variables': { + 'input_jars_paths': [], + }, 'target_conditions': [ ['_toolset == "target"', { 'conditions': [ @@ -30,7 +33,7 @@ '<(DEPTH)/testing/android/AndroidManifest.xml', '<(DEPTH)/testing/android/generate_native_test.py', '<(input_shlib_path)', - '<@(input_jars_paths)', + '>@(input_jars_paths)', ], 'outputs': [ '<(PRODUCT_DIR)/<(test_suite_name)_apk/<(test_suite_name)-debug.apk', @@ -40,7 +43,7 @@ '--native_library', '<(input_shlib_path)', '--jars', - '"<@(input_jars_paths)"', + '">@(input_jars_paths)"', '--output', '<(PRODUCT_DIR)/<(test_suite_name)_apk', '--app_abi', |