DescriptionReland 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. #
Messages
Total messages: 17 (8 generated)
|