aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-02-02Snap for 11400057 from e516e161bcf48403722c6cafe0e8b5f423cec0c4 to ↵simpleperf-releaseAndroid Build Coastguard Worker
simpleperf-release Change-Id: I3268fe859ee93b0007fbdd3e2d94ac5a0f479cea
2023-10-16Snap for 10957012 from fed6e9e6affd5dabee92e23d392818df9833565f to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: Ie2d9a9b8fc64531ee30fe5ddba3852643069f7e4
2023-10-06[automerger skipped] Merge Android 14 am: fed6e9e6af -s ours am: 4e09643ff6 ↵Xin Li
-s ours am: 75163619af -s ours am: 7ecec7d5ee -s ours am skip reason: Merged-In Ib770843dc619faa2df50f0fef3ffa3d969ce4558 with SHA-1 ce296edb61 is already in history Original change: https://android-review.googlesource.com/c/platform/external/cbor-java/+/2775080 Change-Id: I6fa6bd31f58b639854af882d470fdd2ba058cea1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: fed6e9e6af -s ours am: 4e09643ff6 ↵Xin Li
-s ours am: 75163619af -s ours am skip reason: Merged-In Ib770843dc619faa2df50f0fef3ffa3d969ce4558 with SHA-1 ce296edb61 is already in history Original change: https://android-review.googlesource.com/c/platform/external/cbor-java/+/2775080 Change-Id: I00e389d5418e602f26e4be292824d2b2f8ea9d0b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: fed6e9e6af -s ours am: 4e09643ff6 ↵Xin Li
-s ours am skip reason: Merged-In Ib770843dc619faa2df50f0fef3ffa3d969ce4558 with SHA-1 ce296edb61 is already in history Original change: https://android-review.googlesource.com/c/platform/external/cbor-java/+/2775080 Change-Id: Ic46c70f24de9d01a04d2f3adfefdd202cf48b1b8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: fed6e9e6af -s oursXin Li
am skip reason: Merged-In Ib770843dc619faa2df50f0fef3ffa3d969ce4558 with SHA-1 ce296edb61 is already in history Original change: https://android-review.googlesource.com/c/platform/external/cbor-java/+/2775080 Change-Id: I8604b9d43706f56409071c7016cc0f063533ac8b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05Merge Android 14Xin Li
Bug: 298295554 Merged-In: Ib770843dc619faa2df50f0fef3ffa3d969ce4558 Change-Id: I27038c189c45610e04d99aaf947945f6c8f32155
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 3e176e8a21 -s ours ↵Xin Li
am: 2fbd9f23b6 -s ours am: ea442f1487 -s ours am skip reason: Merged-In I14a51df4bf0dfea66a69567f6d39ff4fbf357eaf with SHA-1 f2160038b0 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/cbor-java/+/24182707 Change-Id: Ie70430b52c0e35491643bc59bfd1583f1c887a32 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 3e176e8a21 -s ours ↵Xin Li
am: 2fbd9f23b6 -s ours am skip reason: Merged-In I14a51df4bf0dfea66a69567f6d39ff4fbf357eaf with SHA-1 f2160038b0 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/cbor-java/+/24182707 Change-Id: Iadbf0866b385d37eba418c27f34adb7e977e1e9f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28[automerger skipped] Merge Android U (ab/10368041) am: 3e176e8a21 -s oursXin Li
am skip reason: Merged-In I14a51df4bf0dfea66a69567f6d39ff4fbf357eaf with SHA-1 f2160038b0 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/cbor-java/+/24182707 Change-Id: Ie01dda600f1de124bf51a90d85b5901ff415d28b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14Merge Android U (ab/10368041)tmp_amf_298295554Xin Li
Bug: 291102124 Merged-In: I14a51df4bf0dfea66a69567f6d39ff4fbf357eaf Change-Id: I78b8b341a754f305e29b7aa028e4f8ab89d3279f
2023-07-20Snap for 10448490 from c7a74bb912c762e441f00a379b1cea7bba795777 to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: I3fb7787cb02445dece8e83166a3efb6c62b68db0
2023-04-20Snap for 9982369 from ce296edb619d1484cf4fb3fa05d33d832357d99b to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: Ic9fe7472a92a9600f4de74b2862fb410793f787b
2023-04-20Mark cbor-java as host supported am: ce296edb61 am: c7a74bb912 am: ↵android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseAndrew Scull
bce764290d am: f2160038b0 Original change: https://android-review.googlesource.com/c/platform/external/cbor-java/+/2547916 Change-Id: If060841b2cb4483dc5a3fb1ab6a918dd360faeee Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-19Mark cbor-java as host supported am: ce296edb61 am: c7a74bb912 am: bce764290dandroid14-devAndrew Scull
Original change: https://android-review.googlesource.com/c/platform/external/cbor-java/+/2547916 Change-Id: I14a51df4bf0dfea66a69567f6d39ff4fbf357eaf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-19Mark cbor-java as host supported am: ce296edb61 am: c7a74bb912Andrew Scull
Original change: https://android-review.googlesource.com/c/platform/external/cbor-java/+/2547916 Change-Id: I750f0aff3320ea8c44362c40974f1b072289b55a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-19Mark cbor-java as host supported am: ce296edb61Andrew Scull
Original change: https://android-review.googlesource.com/c/platform/external/cbor-java/+/2547916 Change-Id: I35518e63c9fe989861d1a9710253da3b7c34e9e4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-19Mark cbor-java as host supportedAndrew Scull
Allow host components, such as hostside tests, to use the cbor-java library. Test: TH Change-Id: Ib770843dc619faa2df50f0fef3ffa3d969ce4558
2023-03-15Snap for 9751898 from a2109ed769b45375c8d97c8132eb2ae3a9ff5ec8 to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: I5c51e3d0b09fd267d303bddb95cc2103e8652462
2023-02-24Snap for 9652768 from 3a97420be23bcd60bb000911f7bbd2b7392b533a to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: I49b3a0d55af467e094f795e8d6ad63193257f8b6
2022-12-21[automerge] Remove test_mainline_module on CborJavaTestCases 2p: ba063191e3Jorge Saldivar
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/cbor-java/+/20804490 Bug: 263308389 Change-Id: I9062adfc0064f82b81078ff3dc6a72fdab9c2780
2022-12-21Remove test_mainline_module on CborJavaTestCasesJorge Saldivar
Bug: 263308389 Cbor tests don't need a mainline module to verify the test outcome. The library is a stand alone library which doesn't require installing a mainline module. Test: atest CborJavaTestCases Change-Id: Ie24988f2c223789e52423ea0d5b5b9c75864f65d
2022-12-19[automerger skipped] Allow any apex to link cbor-java am: a3d21b2d84 -s oursSeth Moore
am skip reason: Merged-In I48e7fb5e9f298099b76ce0489fc424349a13de15 with SHA-1 fd31f7f628 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/cbor-java/+/20751507 Change-Id: Ib8ae0c9c2c78b2db17c79c47cfd4d6fd44a8e271 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-15Allow any apex to link cbor-javaSeth Moore
Test: build Change-Id: I48e7fb5e9f298099b76ce0489fc424349a13de15 Merged-In: I48e7fb5e9f298099b76ce0489fc424349a13de15
2022-12-02Snap for 9363649 from fd31f7f628db7c8fc0effa65db7f35b6224d5b1a to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: I392b77f583c9cdb671ababa46ab245bce62beadf
2022-10-31Allow any apex to link cbor-java am: fd31f7f628 am: 3a97420be2 am: a2109ed769Seth Moore
Original change: https://android-review.googlesource.com/c/platform/external/cbor-java/+/2277038 Change-Id: If89b19154067928b260b746654f94adc7fffa701 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-31Allow any apex to link cbor-java am: fd31f7f628 am: 3a97420be2android-u-beta-1-gplSeth Moore
Original change: https://android-review.googlesource.com/c/platform/external/cbor-java/+/2277038 Change-Id: I03b3396087ab644f9a973ab6d9c0e640307af3a1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-31Allow any apex to link cbor-java am: fd31f7f628main-16k-with-phonesSeth Moore
Original change: https://android-review.googlesource.com/c/platform/external/cbor-java/+/2277038 Change-Id: Ic315ede267d5d5ef780fac8dc2dcb69d3dd1f52c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-28Allow any apex to link cbor-javaSeth Moore
Test: build Change-Id: I48e7fb5e9f298099b76ce0489fc424349a13de15
2022-09-02Snap for 9023430 from 179f1daf98c96301c5d78b68d11695ce61c6cd16 to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: Id4bd9484f9e01c7e3fb595e6374530278e85e38c
2022-08-05[automerge] Unpin FutureApiLevel target_sdk_version 2p: aa614ea53bSpandan Das
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/cbor-java/+/19541621 Bug: 227473065 Change-Id: If0b46a493843dc110d4caf379bf7c4fed746a333
2022-08-05Unpin FutureApiLevel target_sdk_versionSpandan Das
With aosp/2164782 in tm-mainline-prod, this will be done automatically by the build system for MTS tests Bug: 227473065 Test: m CborJavaTestCases Test: aapt2 dump badging out/soong/.intermediates/external/cbor-java/CborJavaTestCases/android_common/CborJavaTestCases.apk | grep targetSdkVersion #targetSdkVersion:'10000' Change-Id: I9c1c02164adffeacf42e69664d2d0ccdc0f2ffb2
2022-07-22[automerge] Fixes build issues 2p: 1edfc7e5d6Presubmit Automerger Backend
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/cbor-java/+/19394291 Bug: 239863396 Change-Id: I312d1063cd6667f5f5fb8b0875e3e322e2dea6e3
2022-07-22Fixes build issuesJorge Saldivar
Bug: 239863396 Test: mma Change-Id: I2bd0acdd4c787befd33ea216c6993f1525a54bc2
2022-07-21Updated minSdkVersion to 30 to external/cbor-java am: 07d7a4fce6 am: ↵Jorge Saldivar
179f1daf98 am: 7494e47ea7 am: cc1be3c8e0 am: b205d32566 Original change: https://android-review.googlesource.com/c/platform/external/cbor-java/+/2161183 Change-Id: If434ff73daa6748ab2f4bd7b1683ae17bc806eae Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21Updated minSdkVersion to 30 to external/cbor-java am: 07d7a4fce6 am: ↵Jorge Saldivar
179f1daf98 am: 7494e47ea7 am: cc1be3c8e0 Original change: https://android-review.googlesource.com/c/platform/external/cbor-java/+/2161183 Change-Id: If636655b6dac731b45801693542f621295367d2d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21Updated minSdkVersion to 30 to external/cbor-java am: 07d7a4fce6 am: ↵Jorge Saldivar
179f1daf98 am: 7494e47ea7 Original change: https://android-review.googlesource.com/c/platform/external/cbor-java/+/2161183 Change-Id: Iab0ab40fa5268a890bb3ad4f9ee0145219a4ada9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21Updated minSdkVersion to 30 to external/cbor-java am: 07d7a4fce6 am: 179f1daf98Jorge Saldivar
Original change: https://android-review.googlesource.com/c/platform/external/cbor-java/+/2161183 Change-Id: Ic77e564c3a4fdb50a46b738a4d4e7ff74f0b9b28 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21Updated minSdkVersion to 30 to external/cbor-java am: 07d7a4fce6Jorge Saldivar
Original change: https://android-review.googlesource.com/c/platform/external/cbor-java/+/2161183 Change-Id: Ibed099a028e7e8f39310cfca320380dd55d6be29 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21[automerge] Fixes mainline-presubmit for cbor-java 2p: aeff2df88fPresubmit Automerger Backend
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/cbor-java/+/19369670 Bug: 239268572 Change-Id: If5c54cb12aad1780b881c138a9e85a9abf62c30d
2022-07-21Fixes mainline-presubmit for cbor-javaJorge Saldivar
Bug: 239268572 Test: mma Change-Id: I0f6874e1195b3a74baa5db2c22c830f9b6b7bc95
2022-07-20Updated minSdkVersion to 30 to external/cbor-javaJorge Saldivar
Test: mma Change-Id: I02af30812fbed52c7fca647e41a87bf804bb8fc0
2022-07-20[automerge] Updated minVersion to 30 2p: c273726281Jorge Saldivar
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/cbor-java/+/19369334 Change-Id: I71031242e1c3f2adf14bfea9228f0e87314c0fca
2022-07-20Updated minVersion to 30Jorge Saldivar
Min version was updated to 30, but this file was missed on ag/19141375 Test: mma Change-Id: I52e7046d6dad5edded593c963d7913fa4848a81f
2022-07-12Added min_sdk_version 30 to cbor-java am: c02f70a54b am: 2544653642 am: ↵Jorge Saldivar
eb97354415 am: b240a2eb21 am: 712e4fc5e1 Original change: https://android-review.googlesource.com/c/platform/external/cbor-java/+/2143156 Change-Id: Ie6d7b6861c71d50dd9d6e59d65dbff4c8b1e1a0a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-12Added min_sdk_version 30 to cbor-java am: c02f70a54b am: 2544653642 am: ↵Jorge Saldivar
eb97354415 am: b240a2eb21 Original change: https://android-review.googlesource.com/c/platform/external/cbor-java/+/2143156 Change-Id: Ibae7a6733bc7cb3919ad81954b6f9a350e7d7f24 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-12Added min_sdk_version 30 to cbor-java am: c02f70a54b am: 2544653642 am: ↵Jorge Saldivar
eb97354415 Original change: https://android-review.googlesource.com/c/platform/external/cbor-java/+/2143156 Change-Id: Ibfba9f077f0b032cc5918b6ffc890c3be64178b3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-12Added min_sdk_version 30 to cbor-java am: c02f70a54b am: 2544653642Jorge Saldivar
Original change: https://android-review.googlesource.com/c/platform/external/cbor-java/+/2143156 Change-Id: I35a32f9a8dabe4d5a29dcb381009232ea5e30cba Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-12Added min_sdk_version 30 to cbor-java am: c02f70a54bJorge Saldivar
Original change: https://android-review.googlesource.com/c/platform/external/cbor-java/+/2143156 Change-Id: I651a84348aec5b292b6ef13742a8dbc34d827bf7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-11Added min_sdk_version 30 to cbor-javaJorge Saldivar
Test: mma Change-Id: I2aa3401c5fcc76933c8b2e4f999bed3bbd9155ee
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-30 01:23:02 +0000