aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-06-21Merge "Compile jsoncpp for Mac OS X" am: 412931e954 am: f62be7257b am: ↵android-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseTreehugger Robot
fb1d0dcd60 am: 1d5c303d7a am: bfcabbdf8b am: aaee24528d Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/2629350 Change-Id: Ie75542799fe542081ba56d55909308a1c1769485 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21Merge "Compile jsoncpp for Mac OS X" am: 412931e954 am: f62be7257b am: ↵Treehugger Robot
fb1d0dcd60 am: 1d5c303d7a am: bfcabbdf8b Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/2629350 Change-Id: Ia391908422247922157e670d8f748e9ea0f1ed9c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20Merge "Compile jsoncpp for Mac OS X" am: 412931e954 am: f62be7257b am: ↵Treehugger Robot
fb1d0dcd60 am: 1d5c303d7a Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/2629350 Change-Id: I8c1fdcedd5f1f1270506eea9a4986c703b64c4bf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20Merge "Compile jsoncpp for Mac OS X" am: 412931e954 am: f62be7257b am: ↵Treehugger Robot
fb1d0dcd60 Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/2629350 Change-Id: Ic56cf720d89f6bf0cedc03a4a3817b70657d392d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20Merge "Compile jsoncpp for Mac OS X" am: 412931e954 am: f62be7257bTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/2629350 Change-Id: I4f3f7b82bd1409d1f118a98c9ee2a095f6acbaac Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20Merge "Compile jsoncpp for Mac OS X" am: 412931e954Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/2629350 Change-Id: If9aa37432d5de8a7b4928a008839fad8cafc8311 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20Merge "Compile jsoncpp for Mac OS X"Treehugger Robot
2023-06-16Compile jsoncpp for Mac OS XA. Cody Schuffelen
Bug: 287676000 Test: m libjsoncpp Change-Id: Ic84793c0dbccdc6cbfea478eaedc2103e7efa9a2
2021-12-08Merge "Upgrade jsoncpp to 1.9.5" am: d537ece935 am: 90de0e3376 am: ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000frc_340821000frc_340819280frc_340819220frc_340819190frc_340819030frc_340819020frc_340819010frc_340818170frc_340818110android-vts-14.0_r4android-vts-14.0_r3android-vts-14.0_r2android-vts-14.0_r1android-u-beta-1-gplandroid-security-14.0.0_r8android-security-14.0.0_r7android-security-14.0.0_r6android-security-14.0.0_r5android-security-14.0.0_r4android-security-14.0.0_r3android-security-14.0.0_r2android-security-14.0.0_r1android-platform-14.0.0_r7android-platform-14.0.0_r6android-platform-14.0.0_r5android-platform-14.0.0_r4android-platform-14.0.0_r3android-platform-14.0.0_r2android-platform-14.0.0_r1android-cts-14.0_r4android-cts-14.0_r3android-cts-14.0_r2android-cts-14.0_r1android-14.0.0_r9android-14.0.0_r8android-14.0.0_r7android-14.0.0_r6android-14.0.0_r5android-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_r4android-14.0.0_r39android-14.0.0_r38android-14.0.0_r3android-14.0.0_r28android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r2android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android-14.0.0_r15android-14.0.0_r14android-14.0.0_r13android-14.0.0_r12android-14.0.0_r11android-14.0.0_r10android-14.0.0_r1android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r55android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16aml_uwb_341513070aml_uwb_341511050aml_uwb_341310300aml_uwb_341310030aml_uwb_341111010aml_uwb_341011000aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz5_341510070aml_tz5_341510050aml_tz5_341510010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_odp_341610000aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_go_wif_330911000aml_go_uwb_330912000aml_go_tz4_330912000aml_go_tet_330914010aml_go_swc_330913000aml_go_sta_330911000aml_go_sdk_330810000aml_go_sch_330911000aml_go_res_330912000aml_go_per_330912000aml_go_odp_330913000aml_go_odp_330912000aml_go_neu_330912000aml_go_net_330913000aml_go_mpr_330912000aml_go_ase_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_cfg_341510000aml_ase_341510000aml_ase_341410000aml_ase_341310010aml_ase_341113000aml_ase_340913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_ads_341615050aml_ads_341517040aml_ads_341413000aml_ads_341316030aml_ads_341131050aml_ads_341027030aml_ads_340915050aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000main-16k-with-phonesmain-16kandroid14-tests-releaseandroid14-security-releaseandroid14-s2-releaseandroid14-s1-releaseandroid14-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-platform-releaseandroid14-mainline-uwb-releaseandroid14-mainline-healthfitness-releaseandroid14-mainline-appsearch-releaseandroid14-mainline-adservices-releaseandroid14-gsiandroid14-devandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseandroid14-d1-s7-releaseandroid14-d1-s6-releaseandroid14-d1-s5-releaseandroid14-d1-s4-releaseandroid14-d1-s3-releaseandroid14-d1-s2-releaseandroid14-d1-s1-releaseandroid14-d1-releaseandroid13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-releaseandroid13-mainline-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-go-wifi-releaseandroid13-mainline-go-uwb-releaseandroid13-mainline-go-tzdata4-releaseandroid13-mainline-go-tethering-releaseandroid13-mainline-go-sdkext-releaseandroid13-mainline-go-scheduling-releaseandroid13-mainline-go-resolv-releaseandroid13-mainline-go-permission-releaseandroid13-mainline-go-os-statsd-releaseandroid13-mainline-go-odp-releaseandroid13-mainline-go-neuralnetworks-releaseandroid13-mainline-go-networking-releaseandroid13-mainline-go-mediaprovider-releaseandroid13-mainline-go-media-swcodec-releaseandroid13-mainline-go-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-frc-odp-releaseandroid13-frc-conscrypt-releaseandroid13-frc-cellbroadcast-releaseandroid13-frc-art-releaseandroid13-frc-adbd-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseaml_tz5_341510010aml_tz4_332714010Elliott Hughes
807b6eed29 am: e898ee304b Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1913907 Change-Id: I427d411cdae47a90cbf6d89a8f86a1e28298b913
2021-12-08Merge "Upgrade jsoncpp to 1.9.5" am: d537ece935 am: 90de0e3376 am: 807b6eed29Elliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1913907 Change-Id: Icdb55382934959dbead5b41b143bd433f75b023b
2021-12-08Merge "Upgrade jsoncpp to 1.9.5" am: d537ece935 am: 90de0e3376Elliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1913907 Change-Id: I75e106b330758a1c78a30f2ace282baf0b3928a7
2021-12-08Merge "Upgrade jsoncpp to 1.9.5" am: d537ece935android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Elliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1913907 Change-Id: Id783a0a5e86294848b0b1b04ef3e36d0fc016ee0
2021-12-08Merge "Upgrade jsoncpp to 1.9.5"Elliott Hughes
2021-12-07Upgrade jsoncpp to 1.9.5Elliott Hughes
Test: make Change-Id: I0be1376ee1502a2fd9db2733b503f30f2777a02a
2021-11-08Merge "Update cpe for vulnerability scanners Bug: http://b/201572953 ↵Maria Uretsky
Change-Id: I8e667b6475e00b84aebd8b0b0f5dec8f6f1c34ff" am: 51fd5436a5 am: 04a3a8ab36 am: fc296cc836 am: 1118e6e830 am: 20d68c38f9 Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1843663 Change-Id: I2451b6bd41103fcfda5d4823baf95156a532f03c
2021-11-08Merge "Update cpe for vulnerability scanners Bug: http://b/201572953 ↵Maria Uretsky
Change-Id: I8e667b6475e00b84aebd8b0b0f5dec8f6f1c34ff" am: 51fd5436a5 am: 04a3a8ab36 am: fc296cc836 am: 1118e6e830 Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1843663 Change-Id: I831a2eddf8a2636ad9d973d7dbab974ef05d463c
2021-11-08Merge "Update cpe for vulnerability scanners Bug: http://b/201572953 ↵Maria Uretsky
Change-Id: I8e667b6475e00b84aebd8b0b0f5dec8f6f1c34ff" am: 51fd5436a5 am: 04a3a8ab36 am: fc296cc836 Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1843663 Change-Id: I48c10c5a9c044e512a5b2da930c822165ec86abf
2021-11-08Merge "Update cpe for vulnerability scanners Bug: http://b/201572953 ↵Maria Uretsky
Change-Id: I8e667b6475e00b84aebd8b0b0f5dec8f6f1c34ff" am: 51fd5436a5 am: 04a3a8ab36 Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1843663 Change-Id: I483f1e3d5dd13185ebfac33ce865d5c03305f1ae
2021-11-08Merge "Update cpe for vulnerability scanners Bug: http://b/201572953 ↵Maria Uretsky
Change-Id: I8e667b6475e00b84aebd8b0b0f5dec8f6f1c34ff" am: 51fd5436a5 Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1843663 Change-Id: I021a6b26d80900e5f5130c9a75129bbd8dd51c40
2021-11-08Merge "Update cpe for vulnerability scanners Bug: http://b/201572953 ↵Maria Uretsky
Change-Id: I8e667b6475e00b84aebd8b0b0f5dec8f6f1c34ff"
2021-10-04Update cpe for vulnerability scannersMaria Uretsky
Bug: http://b/201572953 Change-Id: I8e667b6475e00b84aebd8b0b0f5dec8f6f1c34ff
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: I27e8f0f1105454f65c770f8c0fe8f4247fe488fe
2021-05-29Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/jsoncpp" am: 839c129ec5 am: ↵Bob Badour
5439e3a1b4 am: 3fb87af73f am: b3a7c844a4 am: 33f1d76bf6 Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1588526 Change-Id: Ic2e418b75085d099368272b8905c6a71cdaf6a09
2021-03-12Merge "Revert^3 "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-releaseHaibo Huang
easier"" am: 6a7b9633e4 am: b7b7b463ad am: 914b877f8b am: e9d9efff66 Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1633723 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I76ac2578e5d8ae4917b58acf184bc1ca4bc73bed
2021-03-12Merge "Revert^3 "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade ↵Haibo Huang
easier"" am: 6a7b9633e4 am: b7b7b463ad am: 914b877f8b am: e9d9efff66 Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1633723 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia69c01a47a634ce000acb0d376eb211456829ad3
2021-03-12Merge "Revert^3 "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade ↵android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-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-s-v2-preview-1Haibo Huang
easier"" am: 6a7b9633e4 am: b7b7b463ad am: 914b877f8b Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1633723 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3298f926bbd3405ccdcafb953ed96c81b3aabf3a
2021-03-12Merge "Revert^3 "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade ↵Haibo Huang
easier"" am: 6a7b9633e4 am: b7b7b463ad Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1633723 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib7ba34aeea056c65a8e5fb1e0d47e439dcb9eab2
2021-03-12Merge "Revert^3 "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade ↵android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Haibo Huang
easier"" am: 6a7b9633e4 Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1633723 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6de05d36db8cfc7cbf8aaa2264ad210d2536f778
2021-03-12Merge "Revert^3 "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade easier""android-s-beta-2android-s-beta-1Haibo Huang
2021-03-12Revert^3 "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade easier"Haibo Huang
This reverts commit 04ce3dd40e28f337ccd96bdee3464a965654c83f. Reason for revert: try this again Change-Id: Ia27ce73ddd4a0a086da89e4c63cc9a619df39188
2021-03-11Merge "Revert "Revert "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade ↵Treehugger Robot
easier""" am: 2c2a456ec8 am: 549ae99221 am: 87f427b671 am: 7dbaba12dd Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1626980 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I548b832ea1a7332ce84acf41fcc947a7ec06d954
2021-03-11Merge "Revert "Revert "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade ↵Treehugger Robot
easier""" am: 2c2a456ec8 am: 549ae99221 am: 87f427b671 am: 7dbaba12dd Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1626980 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6f624bc560f73915013f03cbd3972970b8c1fbea
2021-03-11Merge "Revert "Revert "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade ↵Treehugger Robot
easier""" am: 2c2a456ec8 am: 549ae99221 am: 87f427b671 Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1626980 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5d1858ea2403a104dad450f4c4c93b67faaf8a46
2021-03-11Merge "Revert "Revert "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade ↵Treehugger Robot
easier""" am: 2c2a456ec8 am: 549ae99221 Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1626980 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5513a5d384af2470a86473543036d3687e70c77b
2021-03-11Merge "Revert "Revert "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade ↵Treehugger Robot
easier""" am: 2c2a456ec8 Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1626980 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8746466bed0afb68deb63038c07f1e29890ac035
2021-03-11Merge "Revert "Revert "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade ↵Treehugger Robot
easier"""
2021-03-11Revert "Revert "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade easier""Patrick Rohr
This reverts commit fdbccc888b01374b90f67a559e1718067ff819e8. Reason for revert: This is breaking most ATV, see go/atv-build-cop-quarterdeck Bug: 182450506 Change-Id: I11190274438b0470fefd432e19121aedb98072d9
2021-03-11Merge "Revert "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade easier"" ↵Haibo Huang
am: 9b1642bccd am: 9725ff3bd2 am: 5c47f00ea3 am: 0e8230737c Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1613901 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5c114a3195ef5648436217b4aaafcd9f5049c63c
2021-03-11Merge "Revert "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade easier"" ↵Haibo Huang
am: 9b1642bccd am: 9725ff3bd2 am: 5c47f00ea3 am: 0e8230737c Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1613901 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iff4436b586e078db638e787be0b4c29c1316e426
2021-03-11Merge "Revert "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade easier"" ↵Haibo Huang
am: 9b1642bccd am: 9725ff3bd2 am: 5c47f00ea3 Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1613901 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifc893cd0837bc3c8198fae073806eadbef713b1a
2021-03-11Merge "Revert "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade easier"" ↵Haibo Huang
am: 9b1642bccd am: 9725ff3bd2 Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1613901 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9aad0ab5df185f8f1dcf7257f6a67fd734d558cc
2021-03-11Merge "Revert "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade easier"" ↵Haibo Huang
am: 9b1642bccd Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1613901 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idfe51c7516191f9b9bb6714ba7a12452ec2d445c
2021-03-11Merge "Revert "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade easier""Haibo Huang
2021-03-03Revert "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade easier"Haibo Huang
This reverts commit ca86dbedfa505cc2762b51e6308b8f9ea8f63fe6. Reason for revert: all users should be fixed Change-Id: I11b7360ef4fbd0423a9be1b47a147ebbeea971aa
2021-03-01Merge changes from topic "jsoncpp_upgrade" am: 0357790661 am: c3cf98ec13 am: ↵Haibo Huang
5da34eb817 am: e788274397 Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1607005 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I14b6bc8dbcab8339da74eb5ebf86a804460131f2
2021-03-01Merge "Add janitors and jophba@ to OWNERS" am: 83709faa5a am: 01a4a41e0b am: ↵Haibo Huang
2c3c675654 am: 28e099f7fc Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1611836 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id6828376a39b59cdd9f93765be5a7149b2627e70
2021-03-01Merge changes from topic "jsoncpp_upgrade" am: 0357790661 am: c3cf98ec13 am: ↵Haibo Huang
5da34eb817 am: e788274397 Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1607005 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I595984f08ca758a38e468187013bfb141430a11a
2021-03-01Merge "Add janitors and jophba@ to OWNERS" am: 83709faa5a am: 01a4a41e0b am: ↵Haibo Huang
2c3c675654 am: 28e099f7fc Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1611836 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0f09f593006d65cd7baf3f6c450a946a579b0584
2021-03-01Merge changes from topic "jsoncpp_upgrade" am: 0357790661 am: c3cf98ec13 am: ↵Haibo Huang
5da34eb817 Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1607005 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7d6daf9d79c0b376e9694becca5fdedf5800f118
2021-03-01Merge "Add janitors and jophba@ to OWNERS" am: 83709faa5a am: 01a4a41e0b am: ↵Haibo Huang
2c3c675654 Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1611836 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I38d62941de8080824f43657fcf00c5cbcbcb1666
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 15:12:39 +0000