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 /chrome/chrome_android.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 'chrome/chrome_android.gypi')
| -rw-r--r-- | chrome/chrome_android.gypi | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/chrome/chrome_android.gypi b/chrome/chrome_android.gypi index 1af9aec..1118407 100644 --- a/chrome/chrome_android.gypi +++ b/chrome/chrome_android.gypi @@ -78,23 +78,7 @@ 'dependencies': [ 'chromium_testshell', ], - # This all_dependent_settings is used for java targets only. This will add - # the chromium_testshell jar to the classpath of dependent java targets. - 'all_dependent_settings': { - 'variables': { - 'input_jars_paths': ['>(apk_output_jar_path)'], - }, - }, - # Add an action with the appropriate output. This allows the generated - # buildfiles to determine which target the output corresponds to. - 'actions': [ - { - 'action_name': 'fake_generate_jar', - 'inputs': [], - 'outputs': ['>(apk_output_jar_path)'], - 'action': [], - }, - ], + 'includes': [ '../build/apk_fake_jar.gypi' ], }, { 'target_name': 'chrome_android_core', |