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

Unified Diff: build/java.gypi

Issue 10837143: Make java.gypi export jar path to input_jars_paths variable (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 4 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 | « build/apk_test.gypi ('k') | chrome/chrome.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/java.gypi
diff --git a/build/java.gypi b/build/java.gypi
index f3d9798f5b01941ee5c8373288996c345672ea83..91db8165874bfc90a4e6e64c25836be56ab2b840 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',
« no previous file with comments | « build/apk_test.gypi ('k') | chrome/chrome.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698