diff options
| author | cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-09 02:20:29 +0000 |
|---|---|---|
| committer | cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-09 02:20:29 +0000 |
| commit | 04fe3783b031204d00c8ff70cd25fa31c6bceb20 (patch) | |
| tree | 2418fe2144764e452b458d9cfe5908cdebf0c9c3 /chrome/chrome_android.gypi | |
| parent | 8a57bee2816922e80fe1450395678d8a8e0afa3f (diff) | |
| download | chromium_src-04fe3783b031204d00c8ff70cd25fa31c6bceb20.zip chromium_src-04fe3783b031204d00c8ff70cd25fa31c6bceb20.tar.gz chromium_src-04fe3783b031204d00c8ff70cd25fa31c6bceb20.tar.bz2 | |
Make java.gypi use all_dependent_settings for input_jars_paths
all_dependent_settings is more like the link_settings that we would like
to use here. This variable is used by java targets to set the classpath
for javac, i.e. to set the libraries that are needed by the target.
Use of direct_dependent_settings with export_dependent_settings causes
unnecessary duplication of all java dependencies for all of our java
library targets.
BUG=146049
TBR=sky,brettw
Review URL: https://chromiumcodereview.appspot.com/10986094
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160768 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_android.gypi')
| -rw-r--r-- | chrome/chrome_android.gypi | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/chrome/chrome_android.gypi b/chrome/chrome_android.gypi index 85d27f9..26dbdf8 100644 --- a/chrome/chrome_android.gypi +++ b/chrome/chrome_android.gypi @@ -94,14 +94,12 @@ 'chrome.gyp:chrome_java', 'chromium_testshell', ], - 'export_dependent_settings': [ - '../media/media.gyp:media_java', - 'chrome.gyp:chrome_java', - ], 'outputs': [ '<(PRODUCT_DIR)/lib.java/chromium_chromium_testshell.jar', ], - 'direct_dependent_settings': { + # This all_dependent_settings is used for java targets only. This will add + # the chromium_testshell jar to the classpath of dependent java targets. + 'all_dependent_settings': { 'variables': { 'input_jars_paths': ['<(PRODUCT_DIR)/lib.java/chromium_chromium_testshell.jar'], }, |