diff options
| author | cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-27 23:31:27 +0000 |
|---|---|---|
| committer | cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-27 23:31:27 +0000 |
| commit | b13f73e498961e56096b42080592034b4c5a1128 (patch) | |
| tree | 78d22ebce54d00a3fcbea6e13c0fd2a7576d6365 /build/java.gypi | |
| parent | e346aef5b64580c0a564d61522c9bfd3b74a6a58 (diff) | |
| download | chromium_src-b13f73e498961e56096b42080592034b4c5a1128.zip chromium_src-b13f73e498961e56096b42080592034b4c5a1128.tar.gz chromium_src-b13f73e498961e56096b42080592034b4c5a1128.tar.bz2 | |
Predex java libraries
dx supports merging of already dexed jars. This means we
can dex jars as part of the library target and then just
merge them when we build the apk.
BUG=158821
Review URL: https://chromiumcodereview.appspot.com/12913009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191063 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/java.gypi')
| -rw-r--r-- | build/java.gypi | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/build/java.gypi b/build/java.gypi index c1d5911..f3bc01e 100644 --- a/build/java.gypi +++ b/build/java.gypi @@ -58,6 +58,7 @@ 'jar_path': '<(PRODUCT_DIR)/lib.java/<(jar_name)', 'jar_excluded_classes': [ '*/R.class', '*/R##*.class' ], 'additional_input_paths': [], + 'dex_path': '<(PRODUCT_DIR)/lib.java/<(_target_name).dex.jar', 'generated_src_dirs': ['>@(generated_R_dirs)'], 'generated_R_dirs': [], 'has_java_resources%': 0, @@ -74,6 +75,7 @@ 'all_dependent_settings': { 'variables': { 'input_jars_paths': ['<(jar_path)'], + 'library_dexed_jars_paths': ['<(dex_path)'], }, }, 'conditions': [ @@ -226,5 +228,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)', + ] + }, + ], } |