aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-26Snap for 7171598 from 3b3acc5c24fd5df42d621ec6df34a5b138001ee3 to sc-d1-releaseandroid-12.0.0_r7android-12.0.0_r6android-12.0.0_r5android-12.0.0_r4android-12.0.0_r15android-12.0.0_r14android-12.0.0_r13android-12.0.0_r12android12-d1-s6-releaseandroid12-d1-s5-releaseandroid12-d1-s4-releaseandroid12-d1-s3-releaseandroid12-d1-s2-releaseandroid12-d1-s1-releaseandroid12-d1-releaseandroid-build-team Robot
Change-Id: I8505a9e0f3d5b5409c285872cf576d5728723750
2021-02-25Mark caliper-tests as not unit tests am: c584a577cd am: d5dbd458d3 am: ↵android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-3android-s-v2-beta-2android-s-qpr3-beta-1android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-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-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-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-devandroid12--mainline-releaseandroid-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Julien Desprez
34343aad43 Original change: https://android-review.googlesource.com/c/platform/external/caliper/+/1605593 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2834e951011e8b7584b0a319ea520d8bdfcd878f
2021-02-25Mark caliper-tests as not unit tests am: c584a577cd am: d5dbd458d3Julien Desprez
Original change: https://android-review.googlesource.com/c/platform/external/caliper/+/1605593 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7b7b9ed4b16cc28535021e373d4ad66fb3e94525
2021-02-25Mark caliper-tests as not unit tests am: c584a577cdandroid-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Julien Desprez
Original change: https://android-review.googlesource.com/c/platform/external/caliper/+/1605593 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I688d41c72acd91c53517191a6bb42ae25fc4d14a
2021-02-25Mark caliper-tests as not unit testsJulien Desprez
They currently require some external jar which doesn't seem to be passed as data from the target. Change-Id: Iad340242cf3e6c90e6f02c685b9a685f3ab20e32 Test: presubmit Bug: 180736967
2021-02-17Snap for 7149879 from ac330ee3e64f98ca3b260e230253c86e3f72abf2 to sc-d1-releaseandroid-build-team Robot
Change-Id: I3c8ac93777b38f16f25b1c132e5aa39644fb5a54
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/caliper am: e2309a4fbb am: ↵Bob Badour
03fbd3376e am: c8773969c1 Original change: https://android-review.googlesource.com/c/platform/external/caliper/+/1588889 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib53a8bb2ad7e8107d261d4621f6332b3592811fc
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/caliper am: e2309a4fbb am: 03fbd3376eBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/caliper/+/1588889 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie99835d55b40a60c5c2e189722a034e02f900574
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/caliper am: e2309a4fbbBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/caliper/+/1588889 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ife5941d7b74c75d68883cb9be7e00cba9fee23c2
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/caliperandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-CDDL SPDX-license-identifier-CDDL-1.0 SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-LGPL to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I6fa5e781c1bbf9c1f65687e2ecc2af9081dd5746
2021-01-27Snap for 7105071 from c03db87365bd94ecdf57d3911e1ed52fac8af559 to sc-d1-releaseandroid-build-team Robot
Change-Id: Ie1a18bdd4f6cf86cb0583f7770e69359521c4ce8
2021-01-25Fix license_type. Contains GPL am: 21eae118bc am: ab25e665b5 am: 14784d62ceBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/caliper/+/1556997 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib9fc4d1304deb4e087ee6068d0f023dde63817c0
2021-01-25Fix license_type. Contains GPL am: 21eae118bc am: ab25e665b5Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/caliper/+/1556997 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iedac98cc827ad8bf60159ca699ccc748e1fdcf56
2021-01-25Fix license_type. Contains GPL am: 21eae118bcBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/caliper/+/1556997 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iaa2d8321545a93c525d585304c3bcc494860c518
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: Ie8271bf516a398548df55d70f258b257dd3ea878
2020-06-28Snap for 6635763 from 1c121eea4a564211ed811ba9f399730bdad1f9f5 to sc-d1-releaseandroid-build-team Robot
Change-Id: Id9bad24c1068c8cd5cb908eb49758465e35dc3ef
2020-06-26Use jsr330 instead of dagger2-inject am: f0a3eafc7e am: e6d8472121 am: ↵Colin Cross
541ef698bd am: fe5febf701 am: 1acec160e1 am: 4644eddbac Original change: https://android-review.googlesource.com/c/platform/external/caliper/+/1350864 Change-Id: I7e91a7fd41358495e245eb7cb259a494d371b4f1
2020-06-26Use jsr330 instead of dagger2-inject am: f0a3eafc7e am: e6d8472121 am: ↵Colin Cross
541ef698bd am: fe5febf701 am: 1acec160e1 Original change: https://android-review.googlesource.com/c/platform/external/caliper/+/1350864 Change-Id: I8780f308867d19aa7d761fd72a774563236c9a29
2020-06-26Use jsr330 instead of dagger2-inject am: f0a3eafc7e am: e6d8472121 am: ↵Colin Cross
541ef698bd am: fe5febf701 Original change: https://android-review.googlesource.com/c/platform/external/caliper/+/1350864 Change-Id: I5aad84b8f889049f5f9bf3925b781a37bfce219d
2020-06-26Use jsr330 instead of dagger2-inject am: f0a3eafc7e am: e6d8472121 am: ↵Colin Cross
541ef698bd Original change: https://android-review.googlesource.com/c/platform/external/caliper/+/1350864 Change-Id: I6a616433371ac92287b09a405ed937f10042efc1
2020-06-26Use jsr330 instead of dagger2-inject am: f0a3eafc7e am: e6d8472121Colin Cross
Original change: https://android-review.googlesource.com/c/platform/external/caliper/+/1350864 Change-Id: Ifed6001a21201522a77e5f3bc94a5f53f457e9a4
2020-06-26Use jsr330 instead of dagger2-inject am: f0a3eafc7eColin Cross
Original change: https://android-review.googlesource.com/c/platform/external/caliper/+/1350864 Change-Id: I62c83aa8b0be5422ad36a8524c5cd4176e1f8aa7
2020-06-25Use jsr330 instead of dagger2-injectandroid-r-beta-3android-r-beta-2Colin Cross
Use external/jsr330 instead of the local dagger2-inject prebuilts. Bug: 158870037 Test: m checkbuild Change-Id: I3ab3ac5af6039c0d8a68c5a893ca902ca7d7e5ff
2020-04-29Snap for 6440903 from 71370966770b1fa9da320237818ffa27a8258aac to sc-d1-releaseandroid-build-team Robot
Change-Id: If5a51491080920783c9d630d59215064899312a4
2020-04-27Add license type: Apache2 is a NOTICE license am: 297612b7c2 am: e66828ca36 ↵Bob Badour
am: 7892f39d5c am: 7096554c07 am: 76a4ce056a am: 32f7c560bc Change-Id: Idbb70983e8a551b1fcf081c31cb407c6001c3625
2020-04-27Add license type: Apache2 is a NOTICE license am: 297612b7c2 am: e66828ca36 ↵Bob Badour
am: 7892f39d5c am: 7096554c07 am: 76a4ce056a Change-Id: If63d77c09fb738d5116ca139168af95111fbdb3b
2020-04-27Add license type: Apache2 is a NOTICE license am: 297612b7c2 am: e66828ca36 ↵Bob Badour
am: 7892f39d5c am: 7096554c07 Change-Id: Ia2913cba0f2bed6f958aba394330580f24364cc0
2020-04-27Add license type: Apache2 is a NOTICE license am: 297612b7c2 am: e66828ca36 ↵Bob Badour
am: 7892f39d5c Change-Id: Ic22726eaf26fc697b541dcb76ed7ac184c37c32f
2020-04-27Add license type: Apache2 is a NOTICE license am: 297612b7c2 am: e66828ca36Bob Badour
Change-Id: I41f1f4e9e9f6c57c55fbdc3e45c321fab762b714
2020-04-27Add license type: Apache2 is a NOTICE license am: 297612b7c2Bob Badour
Change-Id: Id5123ec123ee59b25784e57a9944f80843ace9d2
2020-04-27Add license type: Apache2 is a NOTICE licenseBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Exempt-From-Owner-Approval: janitorial work Change-Id: I1c51ab903ef673b3bcfc2d1f4b0d6afab3e57661
2019-07-04Fix include syntax on libcore/OWNERS file am: 01bfdfe057 am: 6469f304ad am: ↵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-releaseNeil Fuller
a3c9bde9b6 am: 89cb920505 Change-Id: I302365e2f6c20f4ff9ab4d0ad7e38f819855c2b4
2019-07-03Fix include syntax on libcore/OWNERS file am: 01bfdfe057 am: 6469f304adandroid-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-releaseNeil Fuller
am: a3c9bde9b6 Change-Id: I1d7b8720d6adc7a1e922b1f18b1f4171db72ba0d
2019-07-03Fix include syntax on libcore/OWNERS file am: 01bfdfe057ndk-sysroot-r21Neil Fuller
am: 6469f304ad Change-Id: Ie35ae9a3cf35803bb9ab30f01f5dd08cb7657ff3
2019-07-03Fix include syntax on libcore/OWNERS fileNeil Fuller
am: 01bfdfe057 Change-Id: I42cc205a0abed35b6ba865248f7dac5d4aba1676
2019-07-03Fix include syntax on libcore/OWNERS fileandroid-o-mr1-iot-release-1.0.14Neil Fuller
The syntax requires the project to be specified as a prefix. Change-Id: I10c9b98cf2df8e43eed1bbf2c30e8f5bd55135d2 Exempt-From-Owner-Approval: Fixes OWNERS Test: None
2019-07-02Update OWNERS to reference libcore's OWNERS file am: 7bbbcc73b4 am: ↵Neil Fuller
85d42cf3e1 am: e52b6c94b6 am: 0345adc02f Change-Id: Ifdbac85fd48bcb3341bbecf5b21103ed5822b58c
2019-07-02Update OWNERS to reference libcore's OWNERS file am: 7bbbcc73b4 am: 85d42cf3e1Neil Fuller
am: e52b6c94b6 Change-Id: If27a58b2b8acd36ca781bc79a233970b6e0a66da
2019-07-02Update OWNERS to reference libcore's OWNERS file am: 7bbbcc73b4Neil Fuller
am: 85d42cf3e1 Change-Id: I37b88427b5019b5a8fbad76a2857b84f2df14609
2019-07-02Update OWNERS to reference libcore's OWNERS fileNeil Fuller
am: 7bbbcc73b4 Change-Id: I9b8a4c74cec3fdda9bdf2ce832126dfa59db4fb6
2019-07-02Update OWNERS to reference libcore's OWNERS fileNeil Fuller
Update OWNERS to reference libcore's OWNERS file Test: ls ../../libcore/OWNERS Change-Id: I467d6c22dfce6e038522ac91d29d109322d47384
2019-06-05Revert "Fix annotation processors working w/ generated code on OpenJDK 9 ↵Pete Gillin
toolchain" am: 6d6b39bbc8 am: 0908939b5a am: 76ef149620 am: 92e541a0b4 Change-Id: I010a477ed72ac1ee6f2b7f7d968438f3cdb7e144
2019-06-05Revert "Fix annotation processors working w/ generated code on OpenJDK 9 ↵Pete Gillin
toolchain" am: 6d6b39bbc8 am: 0908939b5a am: 76ef149620 Change-Id: I770b092c9487b1de89147589f6f62c9993647e1b
2019-06-05Revert "Fix annotation processors working w/ generated code on OpenJDK 9 ↵Pete Gillin
toolchain" am: 6d6b39bbc8 am: 0908939b5a Change-Id: I8744068f9324d63d8f7169a1fa3077fb73b99485
2019-06-05Revert "Fix annotation processors working w/ generated code on OpenJDK 9 ↵Pete Gillin
toolchain" am: 6d6b39bbc8 Change-Id: I70cbea54bc3231d1536ad150eaf8765a366569a4
2019-06-04Revert "Fix annotation processors working w/ generated code on OpenJDK 9 ↵android-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 55f01c365aae9197a2c6b08116bbdb6ca02b8733. Bug: 62050818 Bug: 131683177 Test: EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9=true make droid Change-Id: I7fd3437c31d3a4ca93f9df8782eb843fa95841da
2019-04-16[automerger skipped] Update caliper for guava 27.1 am: 4d25eeab84 am: ↵Colin Cross
e006364759 -s ours am: 631bf74b4c -s ours am skip reason: change_id I23e13f4073a45b688b1df59d6573625e5a893106 with SHA1 5224dab50f is in history Change-Id: Ifeac61b5eae2e5cc3c95262a536cdf82413f1da0
2019-04-16[automerger skipped] Update caliper for guava 27.1 am: 4d25eeab84Colin Cross
am: e006364759 -s ours am skip reason: change_id I23e13f4073a45b688b1df59d6573625e5a893106 with SHA1 5224dab50f is in history Change-Id: Id36f4b0c913703d98f801384549163ac41e16a61
2019-04-16Update caliper for guava 27.1Colin Cross
am: 4d25eeab84 Change-Id: Ib96846dbb196512b58a6fc7c58f0e007348cbff7
2019-04-15Update caliper for guava 27.1android-o-mr1-iot-release-1.0.12oreo-mr1-iot-releaseColin Cross
The current version of caliper is not compatible with guava 27.1. In order to decouple updating guava from updating caliper, this CL does the minimal changes to caliper to compile with guava 27.1. It should ideally be reverted and replaced with merging an upstream version of caliper that supports guava 27.1. Use java 1.8 to get the new default method in the Predicate interface. @Provides(type = Type.SET) has been replaced with @Provides @IntoSet. Futures.withFallback has been replaced with Futures.catchingAsync. Error Prone now requires checking the return value of ListeningExecutorService.submit. Bug: 130306229 Test: m checkbuild Change-Id: I23e13f4073a45b688b1df59d6573625e5a893106 Merged-In: I23e13f4073a45b688b1df59d6573625e5a893106 Exempt-From-Owner-Approval: cherry pick (cherry picked from commit 5224dab50f25dfcd18c4a2f448e84ca7d1ae6574)
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-25 05:17:34 +0000