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

Issue 2140543002: Reland of move 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

Reland of move android_support_annotations target. (patchset #1 id:1 of https://codereview.chromium.org/2132033002/ ) Reason for revert: Attempting to fix cronet build issues. Original issue's 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} TBR=jochen@chromium.org,bauerb@chromium.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=623012 Committed: https://crrev.com/3196a901443858f34e9c765f32a83eed978a9393 Cr-Commit-Position: refs/heads/master@{#404656}

Patch Set 1 #

Patch Set 2 : 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 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 1 2 chunks +2 lines, -2 lines 0 comments Download
M components/cronet/android/proguard.cfg View 1 1 chunk +2 lines, -0 lines 0 comments Download
M third_party/android_async_task/BUILD.gn View 1 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 1 chunk +1 line, -1 line 0 comments Download

Messages

Total messages: 17 (8 generated)
PEConn
Created Reland of move android_support_annotations target.
4 years, 5 months ago (2016-07-11 08:53:57 UTC) #1
PEConn
@mmenke could you please review the change to proguard.cfg?
4 years, 5 months ago (2016-07-11 13:05:41 UTC) #7
PEConn
To add context, I had previously committed this change, but it broke the Android Cronet ...
4 years, 5 months ago (2016-07-11 13:08:42 UTC) #8
mmenke
[+xunjieli]: Helen, mind taking this one? I'm completely unfamiliar with proguard.
4 years, 5 months ago (2016-07-11 13:10:31 UTC) #10
xunjieli
On 2016/07/11 13:10:31, mmenke wrote: > [+xunjieli]: Helen, mind taking this one? I'm completely unfamiliar ...
4 years, 5 months ago (2016-07-11 13:49:42 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/2140543002/180001
4 years, 5 months ago (2016-07-11 14:40:55 UTC) #13
commit-bot: I haz the power
Committed patchset #2 (id:180001)
4 years, 5 months ago (2016-07-11 14:45:05 UTC) #14
commit-bot: I haz the power
CQ bit was unchecked.
4 years, 5 months ago (2016-07-11 14:45:09 UTC) #15
commit-bot: I haz the power
4 years, 5 months ago (2016-07-11 14:46:56 UTC) #17
Message was sent while issue was closed.
Patchset 2 (id:??) landed as
https://crrev.com/3196a901443858f34e9c765f32a83eed978a9393
Cr-Commit-Position: refs/heads/master@{#404656}

Powered by Google App Engine
This is Rietveld 408576698