aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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)
2019-04-15Update caliper for guava 27.1Colin Cross
am: 5224dab50f Change-Id: Ia88fdff5d5a436ddb6fa4f9a0ca72e9eb6545574
2019-04-12Update caliper for guava 27.1Colin 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
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: 2741fe00d4 Change-Id: Ie86a297815c52ae187ea1d9949a38da1971e7a4e
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: Ic4072d3b3484f2054fdc2b3be6b72beb18989872
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: Ic1d780723b9de1ec7800224034e979eb0b54ab1e
2019-01-23Replace annotation_processors with plugins am: 7b011293a0 am: 9d6a8aa403Colin Cross
am: 5574768382 Change-Id: I189d03a8f464af98bf13ff2552ea49b0e4f55529
2019-01-23Replace annotation_processors with plugins am: 7b011293a0Colin Cross
am: 9d6a8aa403 Change-Id: Iab203e7c20ce714da0b39503980a95ed3c1659ad
2019-01-23Replace annotation_processors with pluginsColin Cross
am: 7b011293a0 Change-Id: I5f79dfbf2885bfbd01cbebe7d5a0e2ed01c7ad6e
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.10Colin Cross
The annotation_processors property is deprecated, replace it with plugins. Bug: 77284273 Test: m checkbuild Change-Id: Ie4a64da00403c8899207d3857c73227341ea13e7
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: ca10212531 -s ours am: c5ca429b6d -s ours am: a851d446a5 -s ours Change-Id: I1ab60c08d56a4f706ccb7da21c520f69059657b3
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: ca10212531 -s ours am: c5ca429b6d -s ours Change-Id: I895dc0e8fd07baa2fee6341e32bafab4f5cfd0d7
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
am: ca10212531 -s ours Change-Id: I9c53fbe64432951046d25295f69c7645fe2c1375
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.7android-n-iot-release-ihome-igv1nougat-iot-releaseBill Yi
Change-Id: I1af8b1fc4272172eb1c478e180d42753ed6effa3
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: c770b49a45 -s ours am: 9652cc0649 -s ours Change-Id: I91ce56a0aca06cc3d6921c05964f0fcacf88d613
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: c770b49a45 -s ours Change-Id: I9de1df3033f9e1502d37f70a7d260d8b44474e2f
2018-10-24Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi
Change-Id: Id1397644a75d796243b0ab065f0b1504ed29acb3
2018-10-10Compile caliper target against core_current am: 03996baab8 am: d0f6db485eNeil Fuller
am: e1346e9611 Change-Id: I8ddcfd489072aba47abb298404a0e9fe30d87832
2018-10-10Compile caliper target against core_current am: 03996baab8Neil Fuller
am: d0f6db485e Change-Id: I14880638fdfb968b11be595d83f1ad28fae7f2eb
2018-10-10Compile caliper target against core_currentNeil Fuller
am: 03996baab8 Change-Id: I3299f4ada0920f4d151d6f3b29a039cc79f6c206
2018-10-10Compile caliper target against core_currentandroid-o-mr1-iot-release-smart-display-r3oreo-mr1-1.2-iot-releaseNeil Fuller
This will make it easier to switch some of its dependents over to using "core Java APIs". e.g. conscrypt-benchmarks. The library doesn't actually need any Android packages to build. Bug: 113148576 Test: build Change-Id: I70fe48e0484c14d1d39ac5590eea662058b4d02c
2018-09-13Convert external/caliper to Android.bp am: b2679aeb30 am: b4eabc7909Colin Cross
am: 7e3aa1f862 Change-Id: Ib13476818a80b99b126a7e4616d681519777ed44
2018-09-13Convert external/caliper to Android.bp am: b2679aeb30Colin Cross
am: b4eabc7909 Change-Id: I551ef9354753dc8461b56a078896735e4f02214a
2018-09-13Convert external/caliper to Android.bpColin Cross
am: b2679aeb30 Change-Id: Ia3b8903d60348d8261eab5fea1821d43d5848569
2018-09-13Convert external/caliper to Android.bpandroid-o-mr1-iot-release-1.0.5Colin Cross
See build/soong/README.md for more information. Test: m checkbuild Change-Id: I998d9397e4eca3df0aff44d16e37a20a461f9a32
2018-09-11Correct METADATA am: 1e38b09f0b am: 39208bfcf5Haibo Huang
am: a832464f59 Change-Id: I9f8ae687eb5f5d47217140ad37f7c038c4896de2
2018-09-11Correct METADATA am: 1e38b09f0bHaibo Huang
am: 39208bfcf5 Change-Id: I4244da76cf98846edde363b4ef455ade2d95847e
2018-09-11Correct METADATAHaibo Huang
am: 1e38b09f0b Change-Id: I0a713953ae8b19af5b52c4fa0f36637eb1d3c874
2018-09-10Correct METADATAHaibo Huang
caliper is not updated by 'git merge'. With git upstream set, updater tool will try to run `git merge-base` and get an error. This changes the url to a github archive. So that the tool will get latest SHA from github and compare. Test: NA Change-Id: I090818668b954046833c36b40b84caef49929bae
2018-06-27Add METADATA for caliper am: 0924626bc5 am: 9a6777b973Haibo Huang
am: 000821e508 Change-Id: Ia08a4d0e6c303b765a4f3cda05d4acbda81819f2
2018-06-27Add METADATA for caliper am: 0924626bc5Haibo Huang
am: 9a6777b973 Change-Id: If2b1dfd1f7b8230812ac0e1a20c823935571bf49
2018-06-27Add METADATA for caliperandroid-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3Haibo Huang
am: 0924626bc5 Change-Id: If6c1f2fcdf93cd69134357f65d38c72d963554bc
2018-06-26Add METADATA for caliperandroid-p-preview-5android-o-mr1-iot-release-1.0.2android-n-iot-release-smart-display-r2Haibo Huang
Test: NA Change-Id: I0755761cae9e81fd1f3665dc69f9961dc4e70a5e
2017-11-19Snap for 4459973 from ab75cacdf76a3a519f4c53108a2576b6b2cf2f75 to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-releaseandroid-build-team Robot
Change-Id: Ie7141a7f5f4feb49d28c8e0f52604cf4cf2d9cc1
2017-11-17Use USE_OPENJDK9 instead of EXPERIMENTAL_USE_OPENJDK9. am: 06f9aaebb4 am: ↵android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devTobias Thierer
1c800fe102 am: 3f7894f2a2 Change-Id: Ida5fecd3fdf066de4ec1942aef0390d0e5e98640
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-29 14:28:54 +0000