diff options
| author | jbudorick <jbudorick@chromium.org> | 2015-08-25 10:42:32 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-25 17:43:38 +0000 |
| commit | 6daf3a522276748b2f69144f63db76a62a30d014 (patch) | |
| tree | 4129dd9617817fd10ddd33634c21aa83131bd6cc /build/java.gypi | |
| parent | 48b4fba870ec20212e451e95a841cab89e6ea121 (diff) | |
| download | chromium_src-6daf3a522276748b2f69144f63db76a62a30d014.zip chromium_src-6daf3a522276748b2f69144f63db76a62a30d014.tar.gz chromium_src-6daf3a522276748b2f69144f63db76a62a30d014.tar.bz2 | |
Revert of [Android] Add gyp support for multidex. (patchset #12 id:220001 of https://codereview.chromium.org/1278573002/ )
Reason for revert:
Somehow broke compilation on the main waterfall: https://build.chromium.org/p/chromium/builders/Android/builds/45388
Original issue's description:
> [Android] Add gyp support for multidex.
>
> Note that this does not enable multidex builds yet.
>
> BUG=272790
>
> Committed: https://crrev.com/e40294eca50d57360a2bb0718adcd5cde7810fbd
> Cr-Commit-Position: refs/heads/master@{#345357}
TBR=agrieve@chromium.org,cjhopman@chromium.org,mmenke@chromium.org,thakis@chromium.org,yfriedman@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=272790
Review URL: https://codereview.chromium.org/1315833007
Cr-Commit-Position: refs/heads/master@{#345370}
Diffstat (limited to 'build/java.gypi')
| -rw-r--r-- | build/java.gypi | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/build/java.gypi b/build/java.gypi index dc642b9..614d50a 100644 --- a/build/java.gypi +++ b/build/java.gypi @@ -64,7 +64,6 @@ 'instr_stamp': '<(intermediate_dir)/instr.stamp', 'additional_input_paths': [], 'dex_path': '<(PRODUCT_DIR)/lib.java/<(_target_name).dex.jar', - 'main_dex_list_path': '<(intermediate_dir)/main_dex_list.txt', 'generated_src_dirs': ['>@(generated_R_dirs)'], 'generated_R_dirs': [], 'has_java_resources%': 0, @@ -114,7 +113,6 @@ 'variables': { 'input_jars_paths': ['<(jar_final_path)'], 'library_dexed_jars_paths': ['<(dex_path)'], - 'main_dex_list_paths': ['<(main_dex_list_path)'], }, }, }], @@ -311,14 +309,6 @@ ] }, { - 'action_name': 'main_dex_list_for_<(_target_name)', - 'variables': { - 'jar_path': '<(javac_jar_path)', - 'output_path': '<(main_dex_list_path)', - }, - 'includes': [ 'android/main_dex_action.gypi' ], - }, - { 'action_name': 'instr_jar_<(_target_name)', 'message': 'Instrumenting <(_target_name) jar', 'variables': { |