summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorcjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-09 18:08:19 +0000
committercjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-09 18:08:19 +0000
commitefdbdb05c0a56ef6c9d23a78e1586bdc733cb504 (patch)
tree3a41fb5c949daf242749f0a415955f375b994a1b /content
parent70e5fe7ce5c2731412fda48ec9c0c554cfece7d4 (diff)
downloadchromium_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 'content')
-rw-r--r--content/content.gyp4
-rw-r--r--content/content_tests.gypi7
2 files changed, 5 insertions, 6 deletions
diff --git a/content/content.gyp b/content/content.gyp
index e048f8b..fcb3e5e 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -246,6 +246,10 @@
'../net/net.gyp:net_java',
'content_common',
],
+ 'export_dependent_settings': [
+ '../base/base.gyp:base_java',
+ '../net/net.gyp:net_java',
+ ],
'variables': {
'package_name': 'content',
'java_in_dir': '../content/public/android/java',
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index f46e038..8548e7d 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -756,18 +756,13 @@
'type': 'none',
'dependencies': [
'../base/base.gyp:base_java',
+ '../net/net.gyp:net_java',
'content_java',
'content_unittests',
- '../net/net.gyp:net_java',
],
'variables': {
'test_suite_name': 'content_unittests',
'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)content_unittests<(SHARED_LIB_SUFFIX)',
- 'input_jars_paths': [
- '<(PRODUCT_DIR)/lib.java/chromium_base.jar',
- '<(PRODUCT_DIR)/lib.java/chromium_content.jar',
- '<(PRODUCT_DIR)/lib.java/chromium_net.jar',
- ],
},
'includes': [ '../build/apk_test.gypi' ],
},