aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-07-01DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵temp_140451723Xin Li
stage-aosp-master Bug: 134405016 Change-Id: I165847a78267e11e2a72f68a64750a9999af10ae
2019-05-03resolve merge conflicts of 47983a039473f3848647c93278e2d4ae9a5eff51 to ↵Haibo Huang
qt-dev-plus-aosp Exempt-From-Owner-Approval: Solve merge conflict Bug: None Test: I solemnly swear I tested this conflict resolution. Change-Id: Idc64b93a422757ad92113b2902908d96730c772e
2019-05-03Upgrade cn-cbor to f1cf9ffdf5cfab935a45900556f9b68af925c256Haibo Huang
am: b83f8d0e76 Change-Id: I28a293ef8aa056e46934cc85214a8a27eeb11cc2
2019-05-03Upgrade cn-cbor to f1cf9ffdf5cfab935a45900556f9b68af925c256Haibo Huang
Test: build Change-Id: I5f2b5af657a6cbe5c2527f6c5097b03160fc6346
2019-04-03Merge master@5428150 into git_qt-dev-plus-aosp.android-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-releaseBill Rassieur
am: a153c76dd4 Change-Id: I1a81576712a178599522c74d865fc162809bdaf4
2019-04-02Merge master@5428150 into git_qt-dev-plus-aosp.Bill Rassieur
Change-Id: I1593b7768d8c76217fb5d30a7459057595f82b25 BUG: 129345239
2019-03-27Fixing the pointer cast for ntoh32p in cn-cborMax Bires
This line was incorrectly casting p to a long pointer rather than a 32 bit integer pointer. Bug: 113512324 Test: it's unused code. Change-Id: Ib296a2b20c7c13bd94b9c7f8b666c4d1213bbfcf
2019-02-24[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
am: 794f4e997f -s ours am skip reason: subject contains skip directive Change-Id: Ib2a57b977070f96ffad51d712959e210f042ceed
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: I8df011f82bc449c9b25401bb39253c787441a7df
2019-01-14Add default code reviewers into OWNERS am: 03dfd17ecc am: bb7c28409dChih-Hung Hsieh
am: 44f57f67d6 Change-Id: I247270545eb4104e6bae3c8cab0afd183a13ed9d
2019-01-14Add default code reviewers into OWNERS am: 03dfd17eccChih-Hung Hsieh
am: bb7c28409d Change-Id: I2ed14a507cde614e135a622aed64148717a291f7
2019-01-14Add default code reviewers into OWNERSChih-Hung Hsieh
am: 03dfd17ecc Change-Id: I69fc3adce5f3a3150b3130c2aae893c81bb2b8e6
2019-01-08Add default code reviewers into OWNERSandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1Chih-Hung Hsieh
Bug: 33166666 Test: gerrit uploader Change-Id: Ic33d4d6c7a207e62f00890c1dcece6b5ae79aaf4
2018-04-05Merge pull request #47 from kaspar030/make_ntohxp_alignment_safecabo
implement alignment-safe ntoh16p() && ntoh32p()
2018-03-23fixup! fixup! implement alignment-safe ntoh16p() && ntoh32p()Kaspar Schleiser
2018-03-23fixup! implement alignment-safe ntoh16p() && ntoh32p()Kaspar Schleiser
2018-03-23fixup! cmake: add align_reads -> -DCBOR_ALIGN_READSKaspar Schleiser
2018-03-23fixup! cmake: add align_reads -> -DCBOR_ALIGN_READSKaspar Schleiser
2018-03-23cmake: add align_reads -> -DCBOR_ALIGN_READSKaspar Schleiser
2018-03-17implement alignment-safe ntoh16p() && ntoh32p()Kaspar Schleiser
2018-02-26Merge pull request #46 from OTAkeys/add_floatcabo
cn-create: add cn_cbor_float_create and cn_cbor_double_create
2018-02-26cn-create: add cn_cbor_float_createVincent Dupont
2018-02-26test: add create double testVincent Dupont
2018-02-26cn-create: add cn_cbor_double_createVincent Dupont
2018-02-02Merge pull request #45 from beduino-project/fix-function-declarationcabo
test: Fix declaration of main method
2018-02-02test: Fix declaration of main methodSören Tempel
2018-01-18Added blueprint, module license, and METADATA file am: dd6fcf75d7 am: 971af5a0a6android-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-wear-8.0.0_r2android-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_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_r3android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r2android-9.0.0_r19android-9.0.0_r18android-9.0.0_r17android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11android-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-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-platform-releasepie-gsipie-dr1-releasepie-dr1-devpie-devpie-cuttlefish-testingpie-cts-releasepie-b4s4-releasepie-b4s4-devmaster-cuttlefish-testing-releaseJanis Danisevskis
am: 8bfe1c1ec2 Change-Id: Ic7463e49012a1a001051719fbc05904da627c1e3
2018-01-18Merge upstream for the first time am: 3798baae63 am: 8a9d358531Janis Danisevskis
am: e198fd1609 Change-Id: I0e76125eb55d56c1980121feeda04de126754ba8
2018-01-18Added blueprint, module license, and METADATA file am: dd6fcf75d7Janis Danisevskis
am: 971af5a0a6 Change-Id: Iad8e4aee7ba301983023adef6d00c2a90e130554
2018-01-18Merge upstream for the first time am: 3798baae63Janis Danisevskis
am: 8a9d358531 Change-Id: I4140da4f2effcdd77979049fa6645f93aa7ad47e
2018-01-18Added blueprint, module license, and METADATA fileJanis Danisevskis
am: dd6fcf75d7 Change-Id: I67c835b995247e4e34e2eaf30ea7c975009fa76b
2018-01-18Merge upstream for the first timeJanis Danisevskis
am: 3798baae63 Change-Id: I88dff63df6e103fe8a285218eec83160db49ef7a
2018-01-17Added blueprint, module license, and METADATA fileandroid-wear-p-preview-2android-wear-8.0.0_r1android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1Janis Danisevskis
2018-01-17Merge upstream for the first timeJanis Danisevskis
Change-Id: Ia6a46e0ead462959993307dcc3d0dfbca045ce2e
2018-01-17Initial empty repository(raulenrique)
2017-10-12Merge pull request #43 from nmeum/gcc-7.2.0cabo
fix compilation error with gcc 7.2.0
2017-10-11fix compilation error with gcc 7.2.0Sören Tempel
2015-11-17Merge pull request #42 from hildjj/cmake-backportscabo
Make Travis cmake builds less interesting, hopefully faster as well
2015-11-17Make Travis cmake builds less interesting, hopefully faster as wellJoe Hildebrand
2015-09-02Merge pull request #41 from jimsch/bytescabo
Declare a byte version of the data (uint8_t *).
2015-09-01Declare a byte version of the dataJim Schaad
Declare a byte version of the data field. This fixes Issue #40
2015-08-27Merge pull request #38 from hildjj/mastercabo
Add Slack notifications for Travis builds
2015-08-27Add Slack notifications for Travis buildsJoe Hildebrand
2015-08-27Add travis badgeCarsten Bormann
2015-08-27Merge pull request #37 from hildjj/mastercabo
Travis CI integration
2015-08-27Simplify Travis build for nowJoe Hildebrand
2015-08-27Add .travis.ymlJoe Hildebrand
2015-08-26Merge pull request #36 from hildjj/free-rootcabo
Make clear that cn_cbor_free is there to free the root of a CBOR item tree. Get rid of a number of gratuitous const qualifiers.
2015-08-26docfixJoe Hildebrand
2015-08-26Remove extraneous const's, fix tests to match, and add an assert to ↵Joe Hildebrand
cn_cbor_free to ensure we're at the root. Freeing NULL is still allowed as a no-op.
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 22:37:04 +0000