summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-05-15Snap for 7362794 from 61ace8e0bfc92f1b1c2b5dea7f119d3160580578 to sc-v2-releaseandroid-vts-12.1_r9android-vts-12.1_r8android-vts-12.1_r7android-vts-12.1_r6android-vts-12.1_r5android-vts-12.1_r4android-vts-12.1_r3android-vts-12.1_r2android-vts-12.1_r10android-vts-12.1_r1android-platform-12.1.0_r9android-platform-12.1.0_r8android-platform-12.1.0_r7android-platform-12.1.0_r6android-platform-12.1.0_r5android-platform-12.1.0_r4android-platform-12.1.0_r3android-platform-12.1.0_r27android-platform-12.1.0_r26android-platform-12.1.0_r25android-platform-12.1.0_r24android-platform-12.1.0_r23android-platform-12.1.0_r22android-platform-12.1.0_r21android-platform-12.1.0_r20android-platform-12.1.0_r2android-platform-12.1.0_r19android-platform-12.1.0_r18android-platform-12.1.0_r17android-platform-12.1.0_r16android-platform-12.1.0_r15android-platform-12.1.0_r14android-platform-12.1.0_r13android-platform-12.1.0_r12android-platform-12.1.0_r11android-platform-12.1.0_r10android-platform-12.1.0_r1android-cts-12.1_r9android-cts-12.1_r8android-cts-12.1_r7android-cts-12.1_r6android-cts-12.1_r5android-cts-12.1_r4android-cts-12.1_r3android-cts-12.1_r2android-cts-12.1_r10android-cts-12.1_r1android-12.1.0_r6android-12.1.0_r5android-12.1.0_r4android-12.1.0_r3android-12.1.0_r27android-12.1.0_r2android-12.1.0_r1android12L-tests-releaseandroid12L-s1-releaseandroid12L-releaseandroid12L-platform-releaseandroid12L-gsiandroid-build-team Robot
Change-Id: Ic070e76491de128601a07af536fa0cdcf7b87f8d
2021-05-13Snap for 7357013 from 1f677215d8bbf59b778ebf0708768338c931d40b to sc-v2-releaseandroid-build-team Robot
Change-Id: If3cdaecbf117a61f9b3f0dcc6856adafa45f1f5d
2021-05-12Merge "Make JAVA_TOOLS_JAR error a little more descriptive." am: 7b46b5a466 ↵saff
am: 01990004ec am: ed699579df am: 1f677215d8 Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1705585 Change-Id: I129f8ba7d7f16acb73c82c66705db67a0e4fb21d
2021-05-12Merge "Make JAVA_TOOLS_JAR error a little more descriptive." am: 7b46b5a466 ↵android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devsaff
am: 01990004ec am: ed699579df Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1705585 Change-Id: I1e9f0af8a47f28b23843d536a2d7b5cc7461eb68
2021-05-12Merge "Make JAVA_TOOLS_JAR error a little more descriptive." am: 7b46b5a466 ↵saff
am: 01990004ec Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1705585 Change-Id: I346feb746e72417c3d26b984591929397867516a
2021-05-12Merge "Make JAVA_TOOLS_JAR error a little more descriptive." am: 7b46b5a466android-s-beta-5android-s-beta-4android-s-beta-3androidx-wear-wear-remote-interactions-releaseandroidx-wear-wear-phone-interactions-releaseandroidx-wear-wear-ongoing-releaseandroidx-resourceinspection-releaseandroid-s-beta-5android-s-beta-4saff
Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1705585 Change-Id: Ia16622160843577edee93774ce02462ef4763777
2021-05-12Merge "Make JAVA_TOOLS_JAR error a little more descriptive."android-s-beta-2android-s-beta-1saff
2021-05-12Make JAVA_TOOLS_JAR error a little more descriptive.saff
Change-Id: I88e7d0453dcbf2066e5504b5c8a5281c2df17075 Test: N/A
2021-02-21Snap for 7160059 from 731b93b4b15f7c3afb8352bac45c26e3031cbc86 to sc-v2-releaseandroid-build-team Robot
Change-Id: Iadb81142541ce7597087ee652bacc7ffefcfe30a
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 8e8dae73d8 -s ↵Xin Li
ours am: 901ed21765 -s ours am skip reason: Change-Id I801754ae658bb983d9b51765b6b8193e7211ac35 with SHA-1 3be7c3017a is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icc7d834f0354dea42692a579a0de8b8f8d3ea1fe
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 8e8dae73d8 -s oursXin Li
am skip reason: Change-Id I801754ae658bb983d9b51765b6b8193e7211ac35 with SHA-1 3be7c3017a is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8add392a4e693f30b02295c173247f1ca1bb7981
2021-02-20Mark ab/7061308 as merged in stage.androidx-leanback-releaseXin Li
Bug: 180401296 Merged-In: I801754ae658bb983d9b51765b6b8193e7211ac35 Change-Id: I3090a97b0e7d2d705908cd42b0e888b1a8533259
2021-02-18Snap for 7152399 from 220cc312538874a582dd473938da9967c6331609 to sc-v2-releaseandroid-build-team Robot
Change-Id: I3012a0f7a3e5ca29b24883f7c70a8ffbeec512c9
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/doclava" am: c6a2f85b20 am: ↵Bob Badour
7e3641a9cf am: ea5f6c5152 Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1588875 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie3d0299595b61c0eea57d1bcdf47ea84624ccd28
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/doclava" am: c6a2f85b20 am: ↵Bob Badour
7e3641a9cf Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1588875 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I61b351a3e1401906b692ddb53dd03471ea9784a5
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/doclava" am: c6a2f85b20Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1588875 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I08edf3b39b06960f505ed3df75f432bd87b176d5
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/doclava"android-s-preview-1Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/doclavaBob Badour
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-CC-BY SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-LGPL SPDX-license-identifier-MIT to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I7a4dccc0832b679bc9ad979a2c6d05f236e18b9f
2021-02-05Snap for 7125381 from 0212c52622ab05822e5864b366dd91201e411e77 to sc-v2-releaseandroid-build-team Robot
Change-Id: I97232c2f02953c1ae90f49957192e61fb766c1a0
2021-02-04Merge "Fix compatchanges.html doc generation" am: 68b279f167 am: 48ad469c43 ↵Treehugger Robot
am: 68faf0dd2b Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1572321 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I34e0e1d5348d5eb1a64bd34b001c0e2818a396a1
2021-02-04Merge "Fix compatchanges.html doc generation" am: 68b279f167 am: 48ad469c43Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1572321 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I76047dcc9a447c7e7ddb07e8e85e64e877cbba74
2021-02-04Merge "Fix compatchanges.html doc generation" am: 68b279f167Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1572321 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I48283ceeedf5cb63d37b6f334c4410cee33ae3f6
2021-02-03Merge "Fix compatchanges.html doc generation"Treehugger Robot
2021-02-03Fix compatchanges.html doc generationAndrei Onea
Add support for compat changes that have the @EnabledSince annotation, and treat the deprecated @EnabledAfter(X) annotations as @EnabledSince(X+1) when generating docs. Bug: 172238506 Test: m offline-sdk-docs Change-Id: Iab10c1b47aa3c78fae80ddc8ff95815511643217
2021-01-28Snap for 7107824 from e8c13afe96e652c35e9f24cb6825ecb88f1bb8da to sc-v2-releaseandroid-build-team Robot
Change-Id: I5e6fc95d83f60fac5d503da846fa810b2bfa242e
2021-01-27Merge "Fix license_type. Contains GPL" am: 606dcd4f3d am: 16a33528cf am: ↵Bob Badour
5fc48c8276 Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1556998 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I15b92dadcca1bc947b012351be24aab6ff7544f4
2021-01-27Merge "Fix license_type. Contains GPL" am: 606dcd4f3d am: 16a33528cfBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1556998 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic0679f01e8fd97a866b91b46d512a00c1ce3d9e0
2021-01-27Merge "Fix license_type. Contains GPL" am: 606dcd4f3dBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1556998 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4e7e9bcbf95246587eed85405e540776f7a9104b
2021-01-27Merge "Fix license_type. Contains GPL"Bob Badour
2021-01-21Fix license_type. Contains GPLBob Badour
See: http://go/android-license-checking-v2-lsc Test: m all Bug: 151953481 Bug: 151177513 Bug: 67772237 Change-Id: I23af680cf89824dbdee511c8aa09a9b3a9d69eb3
2020-12-11Merge "Correct return code from main" am: e0185ef337 am: 06ca6016ba am: ↵Jeff Gaston
3be7c3017a Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1524818 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I28a5f01b6f0ea9d90e99808c35f55a0d4af0cf2d
2020-12-11Merge "Correct return code from main" am: e0185ef337 am: 06ca6016baJeff Gaston
Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1524818 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I801754ae658bb983d9b51765b6b8193e7211ac35
2020-12-11Merge "Correct return code from main" am: e0185ef337Jeff Gaston
Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1524818 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If16509baf9e5d705c87169ff1092c4966bcccb42
2020-12-11Merge "Correct return code from main"Jeff Gaston
2020-12-10Correct return code from mainJeff Gaston
Bug: 175149111 Test: Run main() against some code containing an error, echo the return code and see it's nonzero Change-Id: I42113cf5cc7e5adf10702838236b32eba2c22c8f
2020-11-24Mark ab/6881855 as merged am: bcfa729686 am: 7a94c015d0Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/doclava/+/13111893 Change-Id: Ifd379d87d6732d26b718f9835bd0174e3a47b062
2020-11-24Mark ab/6881855 as merged am: bcfa729686Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/doclava/+/13111893 Change-Id: Ic36782d22cb7175f439d8650646a5abef05d66c7
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: Ie58f1f4e5bebb337139c8ec3f0449e0dcdeab626
2020-10-12Updates doclava to generate java8 bytecode.Joey Kasnicki
Test: m doclava. javap -p -v -cp out/host/linux-x86/framework/doclava.jar com/google/doclava/Converter | grep "major version" (outputs 52 instead of 53 now) Bug: 170392930 Change-Id: I02b34a22380471595cf4a869b6ef7b487b15d213
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 513926fc07 -s ours am: ↵Xin Li
e43a63d6df -s ours am: dbf97faff2 -s ours am skip reason: Change-Id Ifd0f049bf993256ca44b529e8025775fff16a4bb with SHA-1 7ef896b5d9 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/doclava/+/12796980 Change-Id: I07840d26501afe0c3a72192bbd16e483290490d0
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 513926fc07 -s ours am: ↵Xin Li
e43a63d6df -s ours am skip reason: Change-Id Ifd0f049bf993256ca44b529e8025775fff16a4bb with SHA-1 7ef896b5d9 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/doclava/+/12796980 Change-Id: I6938b3ce9ba2ca4d94a93f6b05734d941ce8fca7
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 513926fc07 -s oursXin Li
am skip reason: Change-Id Ifd0f049bf993256ca44b529e8025775fff16a4bb with SHA-1 7ef896b5d9 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/doclava/+/12796980 Change-Id: Ia51cc489ecc37b450abf0d874b169e03e92abdb5
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: aee2105a3f am: 613c45cab4 am: ↵Treehugger Robot
75fef46c05 am: 658f7aa0a4 am: 051d875e80 Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1445755 Change-Id: I867a043f82d5c5de2041c05fd066dcd44625f44d
2020-10-02Merge "Simplify doclava build.gradle" am: aee2105a3f am: 613c45cab4 am: ↵Treehugger Robot
75fef46c05 am: 658f7aa0a4 Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1445755 Change-Id: Ia3e84a36bd3b837ab47b502f13013f7e6d529d5b
2020-10-02Merge "Simplify doclava build.gradle" am: aee2105a3f am: 613c45cab4 am: ↵Treehugger Robot
75fef46c05 Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1445755 Change-Id: Ib65bc8e8c4d215ffdc9fdb1c7ace98b7f36a16c8
2020-10-02Merge "Simplify doclava build.gradle" am: aee2105a3f am: 613c45cab4Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1445755 Change-Id: I524d9bf90366c01910a3a7717e590050dde148fe
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 00:42:52 +0000