diff options
author | cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-09 18:08:19 +0000 |
---|---|---|
committer | cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-09 18:08:19 +0000 |
commit | efdbdb05c0a56ef6c9d23a78e1586bdc733cb504 (patch) | |
tree | 3a41fb5c949daf242749f0a415955f375b994a1b | |
parent | 70e5fe7ce5c2731412fda48ec9c0c554cfece7d4 (diff) | |
download | chromium_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
-rw-r--r-- | base/base.gyp | 1 | ||||
-rw-r--r-- | build/apk_test.gypi | 7 | ||||
-rw-r--r-- | build/java.gypi | 18 | ||||
-rw-r--r-- | chrome/chrome.gyp | 5 | ||||
-rw-r--r-- | chrome/chrome_tests.gypi | 6 | ||||
-rw-r--r-- | content/content.gyp | 4 | ||||
-rw-r--r-- | content/content_tests.gypi | 7 | ||||
-rw-r--r-- | gpu/gpu_common.gypi | 1 | ||||
-rw-r--r-- | ipc/ipc.gyp | 1 | ||||
-rw-r--r-- | media/media.gyp | 12 | ||||
-rw-r--r-- | net/net.gyp | 8 | ||||
-rw-r--r-- | sql/sql.gyp | 1 | ||||
-rw-r--r-- | sync/sync.gyp | 1 | ||||
-rw-r--r-- | ui/ui_unittests.gypi | 1 |
14 files changed, 37 insertions, 36 deletions
diff --git a/base/base.gyp b/base/base.gyp index d893eb4..12898c2 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -976,7 +976,6 @@ 'variables': { 'test_suite_name': 'base_unittests', 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)base_unittests<(SHARED_LIB_SUFFIX)', - 'input_jars_paths': ['<(PRODUCT_DIR)/lib.java/chromium_base.jar',], }, 'includes': [ '../build/apk_test.gypi' ], }, diff --git a/build/apk_test.gypi b/build/apk_test.gypi index bd74105..519e789 100644 --- a/build/apk_test.gypi +++ b/build/apk_test.gypi @@ -19,6 +19,9 @@ # { + 'variables': { + 'input_jars_paths': [], + }, 'target_conditions': [ ['_toolset == "target"', { 'conditions': [ @@ -30,7 +33,7 @@ '<(DEPTH)/testing/android/AndroidManifest.xml', '<(DEPTH)/testing/android/generate_native_test.py', '<(input_shlib_path)', - '<@(input_jars_paths)', + '>@(input_jars_paths)', ], 'outputs': [ '<(PRODUCT_DIR)/<(test_suite_name)_apk/<(test_suite_name)-debug.apk', @@ -40,7 +43,7 @@ '--native_library', '<(input_shlib_path)', '--jars', - '"<@(input_jars_paths)"', + '">@(input_jars_paths)"', '--output', '<(PRODUCT_DIR)/<(test_suite_name)_apk', '--app_abi', diff --git a/build/java.gypi b/build/java.gypi index f3d9798..91db816 100644 --- a/build/java.gypi +++ b/build/java.gypi @@ -26,18 +26,26 @@ # # Finally, the generated jar-file will be: # <(PRODUCT_DIR)/lib.java/chromium_base.jar -# -# TODO(yfriedman): The "finally" statement isn't entirely true yet, as we don't -# auto-generate the ant file yet. { + 'direct_dependent_settings': { + 'variables': { + 'input_jars_paths': ['<(PRODUCT_DIR)/lib.java/chromium_<(package_name).jar'], + }, + }, + 'variables': { + 'input_jars_paths': [], + }, 'actions': [ { 'action_name': 'ant_<(package_name)', 'message': 'Building <(package_name) java sources.', 'inputs': [ - '<(java_in_dir)/<(package_name).xml', - '<!@(find <(java_in_dir) -name "*.java")' + 'android/ant/common.xml', + 'android/ant/chromium-jars.xml', + '<(java_in_dir)/<(package_name).xml', + '<!@(find <(java_in_dir) -name "*.java")', + '>@(input_jars_paths)', ], 'outputs': [ '<(PRODUCT_DIR)/lib.java/chromium_<(package_name).jar', diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 9c1e903..1d65f4a 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1074,6 +1074,11 @@ '../content/content.gyp:content_java', '../net/net.gyp:net_java', ], + 'export_dependent_settings': [ + '../base/base.gyp:base_java', + '../content/content.gyp:content_java', + '../net/net.gyp:net_java', + ], 'variables': { 'package_name': 'chrome', 'java_in_dir': '../chrome/android/java', diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 2f4477c..3a49491 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -4599,18 +4599,12 @@ 'target_name': 'unit_tests_apk', 'type': 'none', 'dependencies': [ - '../base/base.gyp:base_java', - '../net/net.gyp:net_java', 'chrome_java', 'unit_tests', ], 'variables': { 'test_suite_name': 'unit_tests', 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)unit_tests<(SHARED_LIB_SUFFIX)', - 'input_jars_paths': [ - '<(PRODUCT_DIR)/lib.java/chromium_base.jar', - '<(PRODUCT_DIR)/lib.java/chromium_net.jar', - ], }, 'includes': [ '../build/apk_test.gypi' ], }, 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' ], }, diff --git a/gpu/gpu_common.gypi b/gpu/gpu_common.gypi index 699863f..0da2a25 100644 --- a/gpu/gpu_common.gypi +++ b/gpu/gpu_common.gypi @@ -46,7 +46,6 @@ 'variables': { 'test_suite_name': 'gpu_unittests', 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)gpu_unittests<(SHARED_LIB_SUFFIX)', - 'input_jars_paths': [ '<(PRODUCT_DIR)/lib.java/chromium_base.jar', ], }, 'includes': [ '../build/apk_test.gypi' ], }, diff --git a/ipc/ipc.gyp b/ipc/ipc.gyp index 3c62aaa..f7af7d99 100644 --- a/ipc/ipc.gyp +++ b/ipc/ipc.gyp @@ -138,7 +138,6 @@ 'variables': { 'test_suite_name': 'ipc_tests', 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)ipc_tests<(SHARED_LIB_SUFFIX)', - 'input_jars_paths': ['<(PRODUCT_DIR)/lib.java/chromium_base.jar',], }, 'includes': [ '../build/apk_test.gypi' ], }], diff --git a/media/media.gyp b/media/media.gyp index 4ac6b5d..89467dc 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -1019,17 +1019,12 @@ 'target_name': 'media_unittests_apk', 'type': 'none', 'dependencies': [ - '../base/base.gyp:base_java', 'media_java', 'media_unittests', ], 'variables': { 'test_suite_name': 'media_unittests', 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)media_unittests<(SHARED_LIB_SUFFIX)', - 'input_jars_paths': [ - '<(PRODUCT_DIR)/lib.java/chromium_base.jar', - '<(PRODUCT_DIR)/lib.java/chromium_media.jar', - ], }, 'includes': [ '../build/apk_test.gypi' ], }, @@ -1066,7 +1061,12 @@ { 'target_name': 'media_java', 'type': 'none', - 'dependencies': [ '../base/base.gyp:base_java' ], + 'dependencies': [ + '../base/base.gyp:base_java', + ], + 'export_dependent_settings': [ + '../base/base.gyp:base_java', + ], 'variables': { 'package_name': 'media', 'java_in_dir': 'base/android/java', diff --git a/net/net.gyp b/net/net.gyp index ca4b4d3..6ed9798 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -1980,6 +1980,9 @@ 'dependencies': [ '../base/base.gyp:base_java', ], + 'export_dependent_settings': [ + '../base/base.gyp:base_java', + ], 'includes': [ '../build/java.gypi' ], }, ], @@ -1993,17 +1996,12 @@ 'target_name': 'net_unittests_apk', 'type': 'none', 'dependencies': [ - '../base/base.gyp:base_java', 'net_java', 'net_unittests', ], 'variables': { 'test_suite_name': 'net_unittests', 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)net_unittests<(SHARED_LIB_SUFFIX)', - 'input_jars_paths': [ - '<(PRODUCT_DIR)/lib.java/chromium_base.jar', - '<(PRODUCT_DIR)/lib.java/chromium_net.jar', - ], }, 'includes': [ '../build/apk_test.gypi' ], }, diff --git a/sql/sql.gyp b/sql/sql.gyp index dd01ca8..8d8a028 100644 --- a/sql/sql.gyp +++ b/sql/sql.gyp @@ -79,7 +79,6 @@ 'variables': { 'test_suite_name': 'sql_unittests', 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)sql_unittests<(SHARED_LIB_SUFFIX)', - 'input_jars_paths': [ '<(PRODUCT_DIR)/lib.java/chromium_base.jar', ], }, 'includes': [ '../build/apk_test.gypi' ], }, diff --git a/sync/sync.gyp b/sync/sync.gyp index 99356d9..3143b6d 100644 --- a/sync/sync.gyp +++ b/sync/sync.gyp @@ -840,7 +840,6 @@ 'variables': { 'test_suite_name': 'sync_unit_tests', 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)sync_unit_tests<(SHARED_LIB_SUFFIX)', - 'input_jars_paths': [ '<(PRODUCT_DIR)/lib.java/chromium_base.jar', ], }, 'includes': [ '../build/apk_test.gypi' ], }, diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi index 0d01d4f..6c6d6df 100644 --- a/ui/ui_unittests.gypi +++ b/ui/ui_unittests.gypi @@ -245,7 +245,6 @@ 'variables': { 'test_suite_name': 'ui_unittests', 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)ui_unittests<(SHARED_LIB_SUFFIX)', - 'input_jars_paths': ['<(PRODUCT_DIR)/lib.java/chromium_base.jar',], }, 'includes': [ '../build/apk_test.gypi' ], }, |