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

Issue 2132033002: Revert of 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

Revert of Remove android_support_annotations target. (patchset #2 id:20001 of https://codereview.chromium.org/2137433002/ ) Reason for revert: Broke the tree Original issue's 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} TBR=jochen@chromium.org,bauerb@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=623012 Committed: https://crrev.com/2ccd50c3c7f17e770e511096af7d62e36f13135e Cr-Commit-Position: refs/heads/master@{#404390}

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+11 lines, -7 lines) Patch
M build/secondary/third_party/android_tools/BUILD.gn View 1 chunk +4 lines, -0 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 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 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: 7 (2 generated)
PEConn
Created Revert of Remove android_support_annotations target.
4 years, 5 months ago (2016-07-08 15:09:26 UTC) #2
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/2132033002/1
4 years, 5 months ago (2016-07-08 15:09:50 UTC) #3
commit-bot: I haz the power
Committed patchset #1 (id:1)
4 years, 5 months ago (2016-07-08 15:10:35 UTC) #4
commit-bot: I haz the power
Patchset 1 (id:??) landed as https://crrev.com/2ccd50c3c7f17e770e511096af7d62e36f13135e Cr-Commit-Position: refs/heads/master@{#404390}
4 years, 5 months ago (2016-07-08 15:11:46 UTC) #6
PEConn
4 years, 5 months ago (2016-07-11 08:53:57 UTC) #7
Message was sent while issue was closed.
A revert of this CL (patchset #1 id:1) has been created in
https://codereview.chromium.org/2140543002/ by peconn@chromium.org.

The reason for reverting is: Attempting to fix cronet build issues..

Powered by Google App Engine
This is Rietveld 408576698