summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/desugar am: 1a0fa806eeandroid-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/desugar/+/1588228 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I91b0b1aa888ad1d991ebfd5447e9e4e6be440069
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/desugarandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ic7ebbe147bc93842bca7573b58917cb60dc342fb
2020-06-26Use AutoValue from external/auto am: 12b1f91034 am: 1f296b91b9 am: ↵Colin Cross
c7a146f935 am: 15f4b219b2 Original change: https://android-review.googlesource.com/c/platform/external/desugar/+/1344779 Change-Id: Ib9557f6ef827b5ac685d1da7854a17cd47d966f3
2020-06-26Use AutoValue from external/auto am: 12b1f91034 am: 1f296b91b9 am: c7a146f935Colin Cross
Original change: https://android-review.googlesource.com/c/platform/external/desugar/+/1344779 Change-Id: Id6b28ee0f8563890b7381f715110ea37e766c465
2020-06-26Use AutoValue from external/auto am: 12b1f91034 am: 1f296b91b9Colin Cross
Original change: https://android-review.googlesource.com/c/platform/external/desugar/+/1344779 Change-Id: Ia931e21719baa1858b225ffa2c49118f467bee4e
2020-06-26Use AutoValue from external/auto am: 12b1f91034Colin Cross
Original change: https://android-review.googlesource.com/c/platform/external/desugar/+/1344779 Change-Id: I459e785bfccd85ff0a400d025b39e23b254d9300
2020-06-19Use AutoValue from external/autoandroid-r-beta-3android-r-beta-2Colin Cross
Use the AutoValue built from source instead of the prebuilts from external/dagger2. Bug: 158870037 Test: m checkbuild Change-Id: Ibd07aa03e6b3a98a302ea223abf854985b5fec38
2020-04-30Expand desugar METADATA am: 15c557b2d5 am: b694e88fa8 am: fec4db4e2c am: ↵Colin Cross
c3d22cf7f5 Change-Id: I2e28e8619fe99f8ca855e9ad114b40fcdb0c4ae5
2020-04-30Expand desugar METADATA am: 15c557b2d5 am: b694e88fa8 am: fec4db4e2cColin Cross
Change-Id: I39d19399646b52642953bf57b824756c6568bee1
2020-04-30Expand desugar METADATA am: 15c557b2d5 am: b694e88fa8Colin Cross
Change-Id: I3e15fd1129f898265b4522fd0f743d1308dfc632
2020-04-30Expand desugar METADATA am: 15c557b2d5Colin Cross
Change-Id: Ia884ebfe45a12e8d7431de2fd7cb2835dd951e82
2020-04-29Add METADATA to desugar: Apache2=NOTICE am: d61f6e0a07 am: 57576516b2 am: ↵Bob Badour
9fb4079886 am: ad9562605f Change-Id: I5f87ef0d45b71557bcbc4363948e17544dffa10e
2020-04-29Add METADATA to desugar: Apache2=NOTICE am: d61f6e0a07 am: 57576516b2 am: ↵Bob Badour
9fb4079886 Change-Id: Ie207ddc65f3bbad0bcdaa9da6358066614f0c014
2020-04-29Add METADATA to desugar: Apache2=NOTICE am: d61f6e0a07 am: 57576516b2Bob Badour
Change-Id: I1c2954f31f2b7192bc48f835c61683cb3915e467
2020-04-29Add METADATA to desugar: Apache2=NOTICE am: d61f6e0a07Bob Badour
Change-Id: I6edbdc06a0aea2df2657d3643a6b93c16c139454
2020-04-29Expand desugar METADATAColin Cross
Test: none Change-Id: Idc14a4768ea9eccdbfff0aa6602ec60f988689a9
2020-04-28Add METADATA to desugar: Apache2=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: Ia0eef7cc030cf125bba81225683f4bb60a90a592
2019-06-05Revert "Fix annotation processors working w/ generated code on OpenJDK 9 ↵r_aml_301500702android-mainline-12.0.0_r55android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-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_r4android-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_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-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_r2android-mainline-11.0.0_r19android-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_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-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-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releasePete Gillin
toolchain" am: e151dd3ffd am: 073e2db711 am: 39d1301acd am: 3041d69a33 Change-Id: I6e9913dfc196ff7c72632b273d3fed3355c388bd
2019-06-05Revert "Fix annotation processors working w/ generated code on OpenJDK 9 ↵android-r-preview-4android-r-preview-3android-r-preview-2android-r-preview-1android-mainline-10.0.0_r8android-mainline-10.0.0_r6android10-mainline-resolv-releaseandroid10-mainline-networking-releasePete Gillin
toolchain" am: e151dd3ffd am: 073e2db711 am: 39d1301acd Change-Id: I0a909a715c8cf9971f34d9c25efc0659e3c9377f
2019-06-05Revert "Fix annotation processors working w/ generated code on OpenJDK 9 ↵ndk-sysroot-r21Pete Gillin
toolchain" am: e151dd3ffd am: 073e2db711 Change-Id: I5971212de75c83d0bc5f439e4a7fd8b3c0339217
2019-06-05Revert "Fix annotation processors working w/ generated code on OpenJDK 9 ↵Pete Gillin
toolchain" am: e151dd3ffd Change-Id: I13838f13f90913c2a33ddc08450897ac8e8c449a
2019-06-04Revert "Fix annotation processors working w/ generated code on OpenJDK 9 ↵android-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Pete Gillin
toolchain" This change is no longer needed, following http://r.android.com/943770 in April 2019, which upgraded external/dagger2 from a 2015 version of auto-common to version 0.10 (https://github.com/google/auto/releases/tag/auto-common-0.10). This auto-common version does not output code using javax.annotation.Generated if it is is not available, so the module that provides (java.xml.ws.annotation) it can be safely removed. This is beneficial since the module is deprecated in OpenJDK 9 and is removed in later versions. N.B. The change being reverted was to Android.mk, this removes the corresponding lines from the migrated Android.bp. This reverts commit 66b92c8c9172780c5794f47cbe7ede4eeee009b7. Bug: 62050818 Bug: 131683177 Test: EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9=true make droid Change-Id: Id964a685dbadb21f414b15e029d5e02a40ece83f
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseXin Li
am: fa8cc356c5 Change-Id: I8b542771cbc626991b509ddcfba592b27f64846e
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: I38cd25e60f104ca27d10ee95ecf37309c9f1d1f4
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: I8d3477a74075d761caddc4400d0ff9698845050c
2019-01-23Replace annotation_processors with plugins am: ec181dda0f am: 0d3f891929Colin Cross
am: 8f4a327832 Change-Id: I99061be15fad28bdb9f9886a8949cfe4be00ed85
2019-01-23Replace annotation_processors with plugins am: ec181dda0fColin Cross
am: 0d3f891929 Change-Id: Icfcea497a8c81bc8bfbdf0e3f49137c6bad637b5
2019-01-23Replace annotation_processors with pluginsColin Cross
am: ec181dda0f Change-Id: I48f3f6f6a92668f0b2c1b1f815dbb6657bb5b4e9
2019-01-21Replace annotation_processors with pluginsandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releaseColin Cross
The annotation_processors property is deprecated, replace it with plugins. Bug: 77284273 Test: m checkbuild Change-Id: If08ae0e4848e9beb2e53ba852119788c94d0672c
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 1b8781e72f -s ours am: 346fcae40a -s ours am: f4c0268dbf -s ours Change-Id: I5d7f716d094144929d56b3dab3bab71741df33a4
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 1b8781e72f -s ours am: 346fcae40a -s ours Change-Id: Ia9ee2b4864075b6c4ae1dc8ff504cc8bd951ce55
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
am: 1b8781e72f -s ours Change-Id: I34ecab82202a426158044ee20b7dd03a0d1e3085
2018-10-24Merge pie-platform-release to aosp-master - DO NOT MERGEandroid-wear-8.0.0_r2android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7Bill Yi
Change-Id: Ibbec996b0c2308d425f6a60a833521735c5433ad
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 92f6051190 -s ours am: d9a4cce7db -s ours Change-Id: I31b9cad43d763bce3fbeb984d621f2e897d899ea
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 92f6051190 -s ours Change-Id: Id40f2898156e375b2e752657fbe6592d77b8a6e7
2018-10-24Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi
Change-Id: I46a074ccc2b2540d7587f79a68bee754a7261441
2018-09-13Follow renames of host libraries am: 89c6d053f2 am: b7ac6209ceColin Cross
am: aea457c85a Change-Id: I292c1ea9946b7e5716aa97ceff15445ae64f8424
2018-09-13Follow renames of host libraries am: 89c6d053f2Colin Cross
am: b7ac6209ce Change-Id: I3fee43fe2740e581b7c134ba15b302b180a4deb0
2018-09-13Follow renames of host librariesColin Cross
am: 89c6d053f2 Change-Id: I0399039493e54eb7ee92b5855c16aaa6f583f3c9
2018-09-11Follow renames of host librariesandroid-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseColin Cross
Follow rename of dagger2-auto-value-host -> dagger2-auto-value. Test: m checkbuild Change-Id: Id243e12a42fa68d7bf33b10857068532fd1e68b0
2018-05-08Merge remote-tracking branch upstream-master into master am: 9d2aa11004 am: ↵Ivan Gavrilovic
6beb00b474 am: 2b50d295f5 Change-Id: I47f5a0cd0f3fcd010c2c3e0ea92acf49c382bf50
2018-05-08Merge remote-tracking branch upstream-master into master am: 9d2aa11004android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3Ivan Gavrilovic
am: 6beb00b474 Change-Id: I5f801929d952fac02c0b652fb9003295f4bf7820
2018-05-08Merge remote-tracking branch upstream-master into masterIvan Gavrilovic
am: 9d2aa11004 Change-Id: Idc6b70ef72f260b65d9bb7b126f2af059a53e906
2018-05-04Merge remote-tracking branch upstream-master into masterandroid-p-preview-5android-p-preview-4android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1Ivan Gavrilovic
* origin/upstream-master: (43 commits) Allow --worker_max_instances to take MnemonicName=value to specify max for each named worker. Clean up code that directly imports nested classes like Builder, Entry, etc. Clean up code that directly imports nested classes like Builder, Entry, etc. Clean up code that directly imports nested classes like Builder, Entry, etc. Remove use of bare Immutable{List,Map,Set} Builder classes. Relax the assertion in Desugar for checking the calls to $closeResource(...). It is possible that $closeResource(...) is not used as the calls to it might be eliminated by some optimization tools, such as Proguard. Make attempting to change --config in invocation policy an error. Remove alphabetical sorting of options in the canonical list. Remove some deprecated resources flags. Remove category checking from incompatible changes. Support source versions newer than 8 in Bazel's annotation processors stub simple core library bridge methods that only differ in return type RELNOTES: None. Reflect core library moves in super calls, even in default method stubs. Always generate default method stubs for emulated methods. RELNOTES: None. Make KeepScanner tool search classpath for nearest definition of each member reference, instead of potentially referring to a subtype. Refactor desugar's class loading machinery and related code into a separate package for easier reuse in this tool. RELNOTES: None. Minor fixes to KeepScanner tool: - use Guava to read zip entries - Fix keep rules emitted for constructors RELNOTES: None. Support custom implementations of emulated core interface methods RELNOTES: None. tests,windows: enable android.desugar.runtime emulate dynamic dispatch of emulated default interface methods RELNOTES: None. Android desugar config options to exclude methods from interface emulation RELNOTES: None. send invocations to emulated interfaces through dispatch helper. fix logic for implementing emulated interfaces. RELNOTES: None. ... BUG: none Test: existing
2018-05-04Allow --worker_max_instances to take MnemonicName=value to specify max for ↵upstream-masterGoogler
each named worker. RELNOTES: Allow --worker_max_instances to take MnemonicName=value to specify max for each worker. PiperOrigin-RevId: 195244295 GitOrigin-RevId: 0c12603bedd4a270094137269b910a8587d3f93c Change-Id: I1ab6bf78b0101c7fbe842d18c62ce844869e4eec
2018-05-04Clean up code that directly imports nested classes like Builder, Entry, etc.jcater
PiperOrigin-RevId: 195100670 GitOrigin-RevId: 94b8702db5f9a905337aca74bfc2e7c436bf33ec Change-Id: Iea45a0d018d49a43181c1e357721d0b552bea777
2018-05-04Clean up code that directly imports nested classes like Builder, Entry, etc.jcater
PiperOrigin-RevId: 195040539 GitOrigin-RevId: 0a57d3dcb1cc014d65dbeb604035bb34a7191e29 Change-Id: I78ff7b0f225fbdcdeed44145fe0e28ffc0e4c197
2018-05-04Clean up code that directly imports nested classes like Builder, Entry, etc.jcater
PiperOrigin-RevId: 194985157 GitOrigin-RevId: 26ff4b3e3997aab79e39caf62c0d123a315d9478 Change-Id: Ibdf69191b559399f4775d82a52a26ce93567707c
2018-05-04Remove use of bare Immutable{List,Map,Set} Builder classes.jcater
Always use the more-qualified class name for clarity at the site of use. There are too many classes named Builder. PiperOrigin-RevId: 193649193 GitOrigin-RevId: 96d3c91c714544584c9174759bedebf2a6be5e71 Change-Id: I0c9cf0ab619bc743cd15ba63ad7355e008c0f1d1
2018-05-04Relax the assertion in Desugar for checking the calls to $closeResource(...).cnsun
It is possible that $closeResource(...) is not used as the calls to it might be eliminated by some optimization tools, such as Proguard. RELNOTES: n/a. PiperOrigin-RevId: 193262552 GitOrigin-RevId: 1a2ab6d54e2a8749549f41055cd66f3f6dfea4cc Change-Id: Ifdbd7b47132b541ecfd831d2a7b83d76853ec206