summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-11-19Merge "Snap for 6982797 from 513926fc07f451c58e0c346a9c214018eca858fd to ↵androidx-transition-releaseandroid-build-prod (mdb)
androidx-transition-release" into androidx-transition-release
2020-11-19Snap for 6982797 from 513926fc07f451c58e0c346a9c214018eca858fd to ↵android-build-prod (mdb)
androidx-transition-release Change-Id: I798227324b3c58169d45c919578ec6454a592c7f
2020-10-08Skip ab/6749736 in stage.androidx-print-releaseXin Li
Merged-In: Ifd0f049bf993256ca44b529e8025775fff16a4bb Change-Id: I21e632e11e44ce6a75c503b4bd3765b305089d17
2020-10-02Merge "Simplify doclava build.gradle" am: aee2105a3fTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1445755 Change-Id: Ic56af15f9c50cef0941cf5e3c2c24d47689f2c32
2020-10-02Merge "Simplify doclava build.gradle"Treehugger Robot
2020-10-01Simplify doclava build.gradleAurimas Liutikas
- Update to using maven-publish plugin (maven is deprecated) - Remove code for distributing doclava ab/ub-doclava-master has been disabled since 2017 - Remove support for unbundled build, it does not fully work anyway - Update dependencies block to use modern implementation configuration instead of deprecated compile Test: ./gradlew distpublicDocsdistpublicDocs still works Change-Id: Ib9d10b5808a281f596938cf244fabda75b43bd4d
2020-09-29Merge changes I8b0b0ef8,Ib31d5ace am: 0d71f158d1Aurimas Liutikas
Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1442112 Change-Id: I2c4cd87e0ff85e207eae44531e295cefb603bf8d
2020-09-29Merge changes I8b0b0ef8,Ib31d5aceAurimas Liutikas
* changes: Doclava build now making binary identical .jar files across builds Upgrading Doclava to build with Gradle 6.5.1
2020-09-28Doclava build now making binary identical .jar files across buildsJeff Gaston
to reduce the number of things that can change across builds and can need worrying about Bug: 167569304 Test: ./gradlew build Change-Id: I8b0b0ef8d62c3471b86463a45e9871833d23c448
2020-09-28Upgrading Doclava to build with Gradle 6.5.1Jeff Gaston
this doesn't seem to affect composite builds but should be less confusing in case anyone tries to invoke this build directly Bug: 167569304 Test: ./gradlew build Change-Id: Ib31d5ace7456a3d17fd48ea3a5eb9be658f07bd0
2020-08-27Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as mergedXin Li
Bug: 166295507 Merged-In: I4d3a77bfd1d507a282f9e7dbdeb20f9f0d4a8d16 Change-Id: Ife46281d3b032ac367a72e1151314458b8410fc3
2020-08-10Merge "Remove workaround to suppress reference errors." am: cf31db9702Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1394987 Change-Id: Ib4d12b0a752bdc6a7b44f2fcdc2d73469e7c3b36
2020-08-10Merge "Remove workaround to suppress reference errors."Treehugger Robot
2020-08-10Remove workaround to suppress reference errors.Andrew Sapperstein
Leanback prebuilt is being updated so we can remove this workaround. Bug: 6963924 Change-Id: I187f53f1567ec0c13e2d6c77fab228cc61dfb95d Fixes: 155814218 Fixes: 163313403
2020-06-17Merge "Remove NotificationCompat.MessagingStyle.Message from allowlist." am: ↵Treehugger Robot
696f76f1d7 am: 42999b2466 am: 538f777b53 Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1326054 Change-Id: Ifd0f049bf993256ca44b529e8025775fff16a4bb
2020-06-17Merge "Remove NotificationCompat.MessagingStyle.Message from allowlist." am: ↵Treehugger Robot
696f76f1d7 am: 42999b2466 Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1326054 Change-Id: I4d3a77bfd1d507a282f9e7dbdeb20f9f0d4a8d16
2020-06-17Merge "Remove NotificationCompat.MessagingStyle.Message from allowlist." am: ↵Treehugger Robot
696f76f1d7 Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1326054 Change-Id: If55fa22789d038a81a151c24765b9d2da1dc5028
2020-06-17Merge "Remove NotificationCompat.MessagingStyle.Message from allowlist."android-r-beta-3android-r-beta-2Treehugger Robot
2020-06-09Remove NotificationCompat.MessagingStyle.Message from allowlist.Andrew Sapperstein
New prebuilt is coming in with the correct javadoc, so we no longer need this part of the workaround. Fixes: 158494186 Bug: 155814218 Change-Id: If329f3daa8762731014afa93d9a871a418f3cc53
2020-05-26Merge "Suppressing warnings during build of Doclava" am: badd1661de am: ↵Jeff Gaston
b094e0c61f am: 9561b1a712 Change-Id: Ic7fb561e6655d6d8062f514773ef729b48c36539
2020-05-26Merge "Suppressing warnings during build of Doclava" am: badd1661de am: ↵Jeff Gaston
b094e0c61f Change-Id: Ibf0735f3bda99a37ab4501ea30c181b6f04eab69
2020-05-26Merge "Suppressing warnings during build of Doclava" am: badd1661deJeff Gaston
Change-Id: Idcf5baa2cc5b483519c370dacf337c17c0a5cf4e
2020-05-26Merge "Suppressing warnings during build of Doclava"Jeff Gaston
2020-05-26Suppressing warnings during build of DoclavaJeff Gaston
We hope to migrate away from Doclava to Dokka before it becomes necessary to address the warnings Bug: 154755010 Test: Run `cd ../../frameworks/support && ./cleanBuild.sh -y distPublicDocs` \ and see that it doesn't generate any warnings looking like this: /usr/local/google/workspace/aosp-androidx-git/external/doclava/src/com/google/doclava/Converter.java:96: warning: [removal] ClassDoc in com.sun.javadoc has been deprecated and marked for removal Change-Id: I8b05101d606197c5d8459f8cf8051f0851afb3c0
2020-05-05Merge changes from topic "ctor-refs" am: dc123f2a39 am: b3adcbf561 am: ↵Treehugger Robot
0296c8da6c Change-Id: I4f934fd54bd63b1bb8bfa05e08e94daf46beeec7
2020-05-05[automerger skipped] Fix broken links to inner class constructors. am: ↵Andrew Sapperstein
0b7f6c6aaa am: 377a690796 -s ours am: 7a32c11604 -s ours am skip reason: Change-Id Iab578046a562d110be0833f51c762224baa2745e with SHA-1 94b9299ba1 is in history Change-Id: I051a5d0e7a0958f8700b2476118ec5bd07505cd6
2020-05-05[automerger skipped] Stop suppressing @see tags in frameworks/base. am: ↵Andrew Sapperstein
06f3bffd93 am: 5dcd317592 -s ours am: f4704fc8aa -s ours am skip reason: Change-Id Ibd92bbf8702862f3d7e1f95d448f45c24d436404 with SHA-1 3ccda354e7 is in history Change-Id: Id52a289df5681e3c933ad734fa8cd86e8e9f1788
2020-05-05Merge changes from topic "ctor-refs" am: dc123f2a39 am: b3adcbf561Treehugger Robot
Change-Id: Id6efd121ca2ac517d6b0cbdc3a5ff06993724c7d
2020-05-05[automerger skipped] Fix broken links to inner class constructors. am: ↵Andrew Sapperstein
0b7f6c6aaa am: 377a690796 -s ours am skip reason: Change-Id Iab578046a562d110be0833f51c762224baa2745e with SHA-1 94b9299ba1 is in history Change-Id: I859975e2b2d59aa7cda8f73f67e48389fa24875b
2020-05-05[automerger skipped] Stop suppressing @see tags in frameworks/base. am: ↵Andrew Sapperstein
06f3bffd93 am: 5dcd317592 -s ours am skip reason: Change-Id Ibd92bbf8702862f3d7e1f95d448f45c24d436404 with SHA-1 3ccda354e7 is in history Change-Id: I2bbb1596a1be8d2f862fc66d2203a825fc8dc240
2020-05-05Merge changes from topic "ctor-refs" am: dc123f2a39Treehugger Robot
Change-Id: I4be3873104ca866144b02585e125e8338670875b
2020-05-05Fix broken links to inner class constructors. am: 0b7f6c6aaaAndrew Sapperstein
Change-Id: Iac42d0bf283e211081f59cdc621042c5073e481a
2020-05-05Stop suppressing @see tags in frameworks/base. am: 06f3bffd93Andrew Sapperstein
Change-Id: I97b80789acf59ffa42297b4aa064644321da80e3
2020-05-05Merge changes from topic "ctor-refs"Treehugger Robot
* changes: Add workaround for androidx prebuilt references Fix broken links to inner class constructors. Stop suppressing @see tags in frameworks/base.
2020-05-05Add workaround for androidx prebuilt referencesAndrew Sapperstein
androidx generates some of their docs against prebuilts, which can't be updated in sync with the doclava changes to inner class constructor references. This change adds a flag that is off by default that will enable us to conditionally use the old workaround for referring to inner class contructor references. This was an attempt to scope the workaround to the smallest possible applications to the workaround. Once we have updated prebuilts, this workaround can be removed. Bug: 6963924 Test: ./gradlew publicDocsTask and ./gradlew disttipOfTreeDocs Change-Id: I87098a7497e6de51b93baae97a8ca8fdefc6129d Merged-In: I87098a7497e6de51b93baae97a8ca8fdefc6129d
2020-05-02Fix broken links to inner class constructors.Andrew Sapperstein
Bug: 6963924 Test: make doc-comment-check-docs Change-Id: Iab578046a562d110be0833f51c762224baa2745e Merged-In: Iab578046a562d110be0833f51c762224baa2745e
2020-05-02Stop suppressing @see tags in frameworks/base.Andrew Sapperstein
All broken @see references have been fixed. Bug: 6963924 Test: make doc-comment-check-docs Change-Id: Ibd92bbf8702862f3d7e1f95d448f45c24d436404 Merged-In: Ibd92bbf8702862f3d7e1f95d448f45c24d436404
2020-05-02[automerger skipped] Merge "Stop suppressing @see tags in frameworks/base." ↵Andrew Sapperstein
into rvc-dev am: a1bf688efb am: ae81545b8c -s ours am skip reason: Change-Id Ibd92bbf8702862f3d7e1f95d448f45c24d436404 with SHA-1 3ccda354e7 is in history Change-Id: Ib35f3666719025840723102b37e8cc6f7c96b11d
2020-05-02[automerger skipped] Fix broken links to inner class constructors. am: ↵Andrew Sapperstein
94b9299ba1 am: 3a0520d330 -s ours am skip reason: Change-Id Iab578046a562d110be0833f51c762224baa2745e with SHA-1 94b9299ba1 is in history Change-Id: Ie71f93c85f77123d68b6bc6347f3e15d863200b3
2020-05-02Merge "Stop suppressing @see tags in frameworks/base." into rvc-dev am: ↵Andrew Sapperstein
a1bf688efb am: 3c9e3cfea2 Change-Id: I7c3dbd900b3a9c8ee3bdb280a9187ba4b20a2a72
2020-05-02Fix broken links to inner class constructors. am: 94b9299ba1 am: 551253a118Andrew Sapperstein
Change-Id: I092bdaebf7a7f3d19e7f8c6c2ab2f1db9cc21bc5
2020-05-02Merge "Stop suppressing @see tags in frameworks/base." into rvc-dev am: ↵Andrew Sapperstein
a1bf688efb Change-Id: I1f011d7b9e7f8253895a364d44ae29dccf33a789
2020-05-02Fix broken links to inner class constructors. am: 94b9299ba1Andrew Sapperstein
Change-Id: I68dc5837706952f1e8eb905a473addbf1458d0ec
2020-05-02Merge "Stop suppressing @see tags in frameworks/base." into rvc-dev am: ↵android-11.0.0_r16android11-d1-b-releaseAndrew Sapperstein
a1bf688efb Change-Id: Ie46611dc687471ee003d8a56d521ab9a91387b88
2020-05-02Fix broken links to inner class constructors. am: 94b9299ba1Andrew Sapperstein
Change-Id: Ie29587c325ea89547fc068952264f325836ed6f3
2020-05-02Merge "Stop suppressing @see tags in frameworks/base." into rvc-devandroid-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android11-mainline-tethering-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devAndrew Sapperstein
2020-05-01Stop suppressing @see tags in frameworks/base.Andrew Sapperstein
All broken @see references have been fixed. Bug: 6963924 Test: make doc-comment-check-docs Exempt-From-Owner-Approval: cherry-picked from master Change-Id: Ibd92bbf8702862f3d7e1f95d448f45c24d436404 Merged-In: Ibd92bbf8702862f3d7e1f95d448f45c24d436404 (cherry picked from commit da0c247abfd7553f692162154d82cfd0d91c6cde)
2020-05-01Fix broken links to inner class constructors.Andrew Sapperstein
This reverts aosp/166050 which added this workaround. It is no longer needed since we have updated all of the usages to the correct syntax. Bug: 6963924 Bug: 18051133 Test: make doc-comment-check-docs Exempt-From-Owner-Approval: cherry-picked from master Change-Id: Iab578046a562d110be0833f51c762224baa2745e Merged-In: Iab578046a562d110be0833f51c762224baa2745e
2020-05-01Merge "Add METADATA to doclava: Apache2=NOTICE" am: 927d8aa74c am: ↵Treehugger Robot
c1edd3edcb am: f0cf0fb287 Change-Id: Iab14e5da60db5e675761a4d7eb7c8e5d1017e6bc
2020-05-01Merge "Add METADATA to doclava: Apache2=NOTICE" am: 927d8aa74c am: c1edd3edcbTreehugger Robot
Change-Id: I328645ce60ec56d0f247f0b0fa768ded97efe361
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 03:43:52 +0000