aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-02-26Snap for 5335706 from fed431afe2537c1d6c4930d58fe71ff0ca084c0b to qt-releaseandroid-vts-10.0_r9android-vts-10.0_r8android-vts-10.0_r7android-vts-10.0_r6android-vts-10.0_r5android-vts-10.0_r4android-vts-10.0_r3android-vts-10.0_r2android-vts-10.0_r16android-vts-10.0_r15android-vts-10.0_r14android-vts-10.0_r13android-vts-10.0_r12android-vts-10.0_r11android-vts-10.0_r10android-vts-10.0_r1android-security-10.0.0_r75android-security-10.0.0_r74android-security-10.0.0_r73android-security-10.0.0_r72android-security-10.0.0_r71android-security-10.0.0_r70android-security-10.0.0_r69android-security-10.0.0_r68android-security-10.0.0_r67android-security-10.0.0_r66android-security-10.0.0_r65android-security-10.0.0_r64android-security-10.0.0_r63android-security-10.0.0_r62android-security-10.0.0_r61android-security-10.0.0_r60android-security-10.0.0_r59android-security-10.0.0_r58android-security-10.0.0_r57android-security-10.0.0_r56android-security-10.0.0_r55android-security-10.0.0_r54android-security-10.0.0_r53android-security-10.0.0_r52android-security-10.0.0_r51android-security-10.0.0_r50android-security-10.0.0_r49android-security-10.0.0_r48android-mainline-10.0.0_r3android-mainline-10.0.0_r2android-mainline-10.0.0_r1android-cts-10.0_r9android-cts-10.0_r8android-cts-10.0_r7android-cts-10.0_r6android-cts-10.0_r5android-cts-10.0_r4android-cts-10.0_r3android-cts-10.0_r2android-cts-10.0_r16android-cts-10.0_r15android-cts-10.0_r14android-cts-10.0_r13android-cts-10.0_r12android-cts-10.0_r11android-cts-10.0_r10android-cts-10.0_r1android-10.0.0_r6android-10.0.0_r5android-10.0.0_r47android-10.0.0_r46android-10.0.0_r4android-10.0.0_r3android-10.0.0_r2android-10.0.0_r17android-10.0.0_r11android-10.0.0_r10android-10.0.0_r1android10-tests-releaseandroid10-security-releaseandroid10-s3-releaseandroid10-s2-releaseandroid10-s1-releaseandroid10-releaseandroid10-mainline-releaseandroid10-mainline-a-releaseandroid10-gsiandroid-build-team Robot
Change-Id: I884c7bcb3aedaf7f8998246bb7e5e555ee7b339b
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-24Snap for 5254928 from 02061ca2c5772519b4483240de2ccd53a38968aa to qt-releaseandroid-build-team Robot
Change-Id: I9800a7d379e0f5419ccc53393d835dd0af480466
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-28Snap for 5096429 from a4c578700022addf80a8ef1199267ff245e3a619 to qt-releaseandroid-build-team Robot
Change-Id: Ied7c9a4a237dc1a3e1398f20a40e0b0e20030b59
2018-10-25Snap for 5090430 from 8bcec1d641b72d72a33c5980082e5ac5d2f7c68d to qt-releaseandroid-build-team Robot
Change-Id: I4655f931b30439f53acecfb4a4522c892d4bd8b4
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-11Snap for 5060940 from 479ebd0e88ae929933af682440031a7b609e4236 to qt-releaseandroid-build-team Robot
Change-Id: I9f4499e0aec1920fe2cecdae53af69408a199153
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-16Snap for 5012867 from 2077eddc6d5aaa0512ef834683ba8bf6ff6d0d59 to qt-releaseandroid-build-team Robot
Change-Id: Ic44972c55cad8c7734c1939926b1c5f7da5aa90f
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-12Snap for 5004953 from 17c14d896b2261cc27b0fc8c27f690f05903b32d to qt-releaseandroid-build-team Robot
Change-Id: I3f1cc34109302688a11b2128214a00b3a682e5ac
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-29Snap for 4869171 from fa661c07b4a72f85708391ad26fbc29349ff1e71 to qt-releaseandroid-build-team Robot
Change-Id: I192fb4d59c8c4eaffeea103b40149224c2782826
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
2017-11-17Use USE_OPENJDK9 instead of EXPERIMENTAL_USE_OPENJDK9. am: 06f9aaebb4Tobias Thierer
am: 1c800fe102 Change-Id: Iaac18f3de5e1f34f5ac573f8a61904cfe990ff7a
2017-11-17Use USE_OPENJDK9 instead of EXPERIMENTAL_USE_OPENJDK9.android-wear-p-preview-2android-wear-8.0.0_r1android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8o-mr1-iot-preview-7Tobias Thierer
am: 06f9aaebb4 Change-Id: I40400d68170d9e62c1a0af3bb385e52743428fb6
2017-11-15Use USE_OPENJDK9 instead of EXPERIMENTAL_USE_OPENJDK9.android-o-mr1-iot-preview-6o-mr1-iot-preview-6Tobias Thierer
This avoids duplicating the semantics of an unset/empty EXPERIMENTAL_USE_OPENJDK9. Test: make showcommands core-oj (in environments with EXPERIMENTAL_USE_OPENJDK9 set to "", "1.8", and "true"). Bug: 38177295 Change-Id: Ibcd85c36a2fee78071ed382a81df0f9634e6ac8f
2017-06-06Merge "Add OWNERS in external/caliper" am: eef5108021 am: 7ed061e7f8 am: ↵oreo-mr1-devoreo-dr1-devChih-hung Hsieh
4da283318c am: fc57a58a34 Change-Id: If8048bee821520b480e7fe03f5804396e7de984c
2017-06-06Merge "Add OWNERS in external/caliper" am: eef5108021 am: 7ed061e7f8android-o-mr1-preview-2android-o-mr1-preview-1Chih-hung Hsieh
am: 4da283318c Change-Id: I36897b4617108d605c22e654341c5877ed9ea409
2017-06-06Merge "Add OWNERS in external/caliper" am: eef5108021Chih-hung Hsieh
am: 7ed061e7f8 Change-Id: I394359691578c966291667de4f144e49ec536948
2017-06-06Merge "Add OWNERS in external/caliper"Chih-hung Hsieh
am: eef5108021 Change-Id: Iefd434ab733ec0abaddac20920bd3f2ba5d1e98f
2017-06-06Merge "Add OWNERS in external/caliper"android-o-preview-4android-o-iot-preview-5o-iot-preview-5Chih-hung Hsieh
2017-06-05Add OWNERS in external/caliperChih-Hung Hsieh
* Owners are selected from top CL approvals or owners. They will be suggested to review/approve future CLs. * OWNERS files are recognized by the new find-owners plugin, see .md files in https://gerrit.googlesource.com/plugins/find-owners/+/master/src/main/resources/Documentation/ Test: build/make/tools/checkowners.py -c -v OWNERS Change-Id: Ia2600f38dc50f2b8c0cf659f25d1520b9464a2fb
2017-05-26Fix annotation processors working w/ generated code on OpenJDK 9 toolchain ↵Tobias Thierer
am: 55f01c365a am: 0f9731749e am: 801853e176 am: 36eafd2643 Change-Id: I9234211456e09ab3782bf5167adbb3a889276710