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

Unified Diff: build/java.gypi

Issue 12913009: Predex java libraries (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@antpy
Patch Set: Created 7 years, 9 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 | « no previous file | build/java_apk.gypi » ('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 67c3fd5bb929e79feb7063e4d9939b8055d1a1e8..40c875e95f266dfacdd45efefb69c1db206b7767 100644
--- a/build/java.gypi
+++ b/build/java.gypi
@@ -53,6 +53,7 @@
'jar_name': '<(_target_name).jar',
'jar_path': '<(PRODUCT_DIR)/lib.java/<(jar_name)',
'jar_excluded_classes': [ '*/R.class', '*/R##*.class' ],
+ 'dex_path': '<(PRODUCT_DIR)/lib.java/<(_target_name).dex.jar',
shashi 2013/03/23 01:07:41 nit: it may be cleaner to have a separate folder:
'additional_input_paths': ['>@(additional_R_files)'],
'generated_src_dirs': ['>@(generated_R_dirs)'],
'generated_R_dirs': [],
@@ -68,6 +69,7 @@
'all_dependent_settings': {
'variables': {
'input_jars_paths': ['<(jar_path)'],
+ 'library_dexed_jars_paths': ['<(dex_path)'],
},
},
'conditions': [
@@ -206,5 +208,28 @@
'--ignore=>!(echo \'>(_inputs)\' | md5sum)',
]
},
+ {
+ 'action_name': 'dex_<(_target_name)',
+ 'message': 'Dexing <(_target_name) jar',
+ 'inputs': [
+ '<(DEPTH)/build/android/pylib/build_utils.py',
+ '<(DEPTH)/build/android/dex.py',
+ '<(jar_path)',
+ ],
+ 'outputs': [
+ '<(dex_path)',
+ ],
+ 'action': [
+ 'python', '<(DEPTH)/build/android/dex.py',
+ '--dex-path=<(dex_path)',
+ '--android-sdk-root=<(android_sdk_root)',
+
+ # TODO(newt): remove this once http://crbug.com/177552 is fixed in ninja.
+ '--ignore=>!(echo >(_inputs) | md5sum)',
+
+ '<(jar_path)',
+ ]
+ },
+
],
}
« no previous file with comments | « no previous file | build/java_apk.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698