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
This commit is contained in:
base
build
chrome
content
net
ui
@ -146,9 +146,6 @@
|
||||
'dependencies': [
|
||||
'base_java',
|
||||
],
|
||||
'export_dependent_settings': [
|
||||
'base_java',
|
||||
],
|
||||
}],
|
||||
['os_bsd==1', {
|
||||
'include_dirs': [
|
||||
|
@ -39,7 +39,9 @@
|
||||
'dependencies': [
|
||||
'<(DEPTH)/build/build_output_dirs_android.gyp:build_output_dirs'
|
||||
],
|
||||
'direct_dependent_settings': {
|
||||
# This all_dependent_settings is used for java targets only. This will add the
|
||||
# chromium_<(package_name) jar to the classpath of dependent java targets.
|
||||
'all_dependent_settings': {
|
||||
'variables': {
|
||||
'input_jars_paths': ['<(PRODUCT_DIR)/lib.java/chromium_<(package_name).jar'],
|
||||
},
|
||||
|
@ -1089,12 +1089,6 @@
|
||||
'../content/content.gyp:content_java',
|
||||
'../ui/ui.gyp:ui_java',
|
||||
],
|
||||
'export_dependent_settings': [
|
||||
'../base/base.gyp:base',
|
||||
'../chrome/browser/component/components.gyp:web_contents_delegate_android_java',
|
||||
'../content/content.gyp:content_java',
|
||||
'../ui/ui.gyp:ui_java',
|
||||
],
|
||||
'variables': {
|
||||
'package_name': 'chrome',
|
||||
'java_in_dir': '../chrome/android/java',
|
||||
|
@ -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'],
|
||||
},
|
||||
|
@ -286,11 +286,6 @@
|
||||
'common_aidl',
|
||||
'content_common',
|
||||
],
|
||||
'export_dependent_settings': [
|
||||
'../base/base.gyp:base',
|
||||
'../net/net.gyp:net',
|
||||
'../ui/ui.gyp:ui_java',
|
||||
],
|
||||
'variables': {
|
||||
'package_name': 'content',
|
||||
'java_in_dir': '../content/public/android/java',
|
||||
|
@ -612,14 +612,10 @@
|
||||
'../net/net.gyp:net_java',
|
||||
'../ui/ui.gyp:ui_java',
|
||||
],
|
||||
'export_dependent_settings': [
|
||||
'content_java',
|
||||
'../base/base.gyp:base_java',
|
||||
'../media/media.gyp:media_java',
|
||||
'../net/net.gyp:net_java',
|
||||
'../ui/ui.gyp:ui_java',
|
||||
],
|
||||
'direct_dependent_settings': {
|
||||
# This all_dependent_settings is used for java targets only. This will
|
||||
# add the content_shell jar to the classpath of dependent java
|
||||
# targets.
|
||||
'all_dependent_settings': {
|
||||
'variables': {
|
||||
'input_jars_paths': ['<(PRODUCT_DIR)/lib.java/chromium_content_shell.jar'],
|
||||
},
|
||||
|
11
net/net.gyp
11
net/net.gyp
@ -1113,9 +1113,6 @@
|
||||
'dependencies': [
|
||||
'net_java',
|
||||
],
|
||||
'export_dependent_settings': [
|
||||
'net_java',
|
||||
],
|
||||
}],
|
||||
[ 'OS == "android"', {
|
||||
'dependencies': [
|
||||
@ -2149,9 +2146,6 @@
|
||||
'../base/base.gyp:base',
|
||||
'net_errors_java',
|
||||
],
|
||||
'export_dependent_settings': [
|
||||
'../base/base.gyp:base',
|
||||
],
|
||||
'includes': [ '../build/java.gypi' ],
|
||||
},
|
||||
{
|
||||
@ -2166,11 +2160,6 @@
|
||||
'../base/base.gyp:base_java_test_support',
|
||||
'net_java',
|
||||
],
|
||||
'export_dependent_settings': [
|
||||
'../base/base.gyp:base',
|
||||
'../base/base.gyp:base_java_test_support',
|
||||
'net_java',
|
||||
],
|
||||
'includes': [ '../build/java.gypi' ],
|
||||
},
|
||||
{
|
||||
|
@ -822,9 +822,6 @@
|
||||
'dependencies': [
|
||||
'ui_java',
|
||||
],
|
||||
'export_dependent_settings': [
|
||||
'ui_java',
|
||||
],
|
||||
}],
|
||||
['OS=="android" or OS=="ios"', {
|
||||
'sources!': [
|
||||
@ -876,9 +873,6 @@
|
||||
'dependencies': [
|
||||
'../base/base.gyp:base_java',
|
||||
],
|
||||
'export_dependent_settings': [
|
||||
'../base/base.gyp:base_java',
|
||||
],
|
||||
'includes': [ '../build/java.gypi' ],
|
||||
},
|
||||
],
|
||||
|
Reference in New Issue
Block a user