Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(162)

Unified Diff: chrome/chrome_android.gypi

Issue 10986094: Make java.gypi use all_dependent_settings for input_jars_paths (Closed) Base URL: http://git.chromium.org/chromium/src.git@apk_combine
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/chrome.gyp ('k') | content/content.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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'],
},
« no previous file with comments | « chrome/chrome.gyp ('k') | content/content.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698