From b13f73e498961e56096b42080592034b4c5a1128 Mon Sep 17 00:00:00 2001 From: "cjhopman@chromium.org" Date: Wed, 27 Mar 2013 23:31:27 +0000 Subject: 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 --- build/java.gypi | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'build/java.gypi') 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)', + ] + }, + ], } -- cgit v1.1