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

Issue 2137433002: Remove android_support_annotations target. (Closed)

Created:
4 years, 5 months ago by PEConn
Modified:
4 years, 5 months ago
CC:
cbentzel+watch_chromium.org, chromium-reviews
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Remove android_support_annotations target. android-support-annotations.jar and android-support-v13.jar both define android.support.annotations. Since we use both, this can produce errors building when we try to use android.support.annotations in a new target (eg com.android.dex.DexException: Multiple dex files define Landroid/support/annotation/AnimRes). android-support-annotations.jar contains a subset of android-support-v13.jar, so I am removing it and updating all dependencies to point to the latter. BUG=623012 Committed: https://crrev.com/dd8383aa3af51d5c067e445c1390dc9eadc6a220 Cr-Commit-Position: refs/heads/master@{#404371}

Patch Set 1 #

Patch Set 2 : Update comment #

Patch Set 3 : Add supressions for proguard warnings from the android support libraries. #

Unified diffs Side-by-side diffs Delta from patch set Stats (+9 lines, -11 lines) Patch
M build/secondary/third_party/android_tools/BUILD.gn View 1 chunk +0 lines, -4 lines 0 comments Download
M components/cronet.gypi View 2 chunks +2 lines, -2 lines 0 comments Download
M components/cronet/android/BUILD.gn View 2 chunks +2 lines, -2 lines 0 comments Download
M components/cronet/android/proguard.cfg View 1 2 1 chunk +2 lines, -0 lines 0 comments Download
M third_party/android_async_task/BUILD.gn View 1 chunk +1 line, -1 line 0 comments Download
M third_party/android_async_task/README.chromium View 1 1 chunk +1 line, -1 line 0 comments Download
M third_party/espresso/BUILD.gn View 1 chunk +1 line, -1 line 0 comments Download

Messages

Total messages: 20 (9 generated)
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2137433002/1
4 years, 5 months ago (2016-07-08 09:39:33 UTC) #2
PEConn
PTAL.
4 years, 5 months ago (2016-07-08 10:39:43 UTC) #5
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2137433002/20001
4 years, 5 months ago (2016-07-08 10:42:55 UTC) #7
Bernhard Bauer
lgtm
4 years, 5 months ago (2016-07-08 10:45:54 UTC) #8
jochen (gone - plz use gerrit)
lgtm
4 years, 5 months ago (2016-07-08 12:52:35 UTC) #11
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2137433002/20001
4 years, 5 months ago (2016-07-08 12:54:20 UTC) #13
commit-bot: I haz the power
Committed patchset #2 (id:20001)
4 years, 5 months ago (2016-07-08 14:23:07 UTC) #15
commit-bot: I haz the power
CQ bit was unchecked.
4 years, 5 months ago (2016-07-08 14:23:22 UTC) #16
commit-bot: I haz the power
Patchset 2 (id:??) landed as https://crrev.com/dd8383aa3af51d5c067e445c1390dc9eadc6a220 Cr-Commit-Position: refs/heads/master@{#404371}
4 years, 5 months ago (2016-07-08 14:25:56 UTC) #18
mgersh
On 2016/07/08 14:25:56, commit-bot: I haz the power wrote: > Patchset 2 (id:??) landed as ...
4 years, 5 months ago (2016-07-08 14:55:01 UTC) #19
PEConn
4 years, 5 months ago (2016-07-08 15:09:25 UTC) #20
Message was sent while issue was closed.
A revert of this CL (patchset #2 id:20001) has been created in
https://codereview.chromium.org/2132033002/ by peconn@chromium.org.

The reason for reverting is: Broke the tree.

Powered by Google App Engine
This is Rietveld 408576698