| Index: chrome/chrome_android.gypi
|
| diff --git a/chrome/chrome_android.gypi b/chrome/chrome_android.gypi
|
| index 85d27f9d44c457699f508758ef9f616029cb658b..26dbdf8c70d6e07191d0d542d55b3433d41b2cda 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'],
|
| },
|
|
|