aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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 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 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 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
2021-03-01Merge changes from topic "jsoncpp_upgrade" am: 0357790661 am: c3cf98ec13Haibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1607005 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8856e0e9ed76aaf742cc56244723d89f34c62176
2021-03-01Merge "Add janitors and jophba@ to OWNERS" am: 83709faa5a am: 01a4a41e0bHaibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1611836 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9d2ef659c60ae57f855ebf6d218e2abf757f9252
2021-03-01Merge changes from topic "jsoncpp_upgrade" am: 0357790661Haibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1607005 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4e6c74459b9d6fa2246192ba8321224ff0f590fb
2021-03-01Merge "Add janitors and jophba@ to OWNERS" am: 83709faa5aHaibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1611836 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I799684c2acfae1137a77f1be287075b51dff45a5
2021-03-01Merge changes from topic "jsoncpp_upgrade"Haibo Huang
* changes: [jsoncpp] disable JSONCPP_DEPRECATED to make upgrade easier [jsoncpp] Disable locale support Upgrade jsoncpp to 1.9.4
2021-03-01[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade easierHaibo Huang
There are too many references to the deprecated APIs. It is difficult to upgrade them all at once, or add -Wno-deprecated-declarations to all of them. Bug: 170642246 Change-Id: Icf9d1d024042d8b541c8d8d427fb35ef58630baa
2021-03-01[jsoncpp] Disable locale supportHaibo Huang
'localeconv' has been marked as being introduced in Android 21 here, but the deployment target is Android 16.0.0 Bug: 170642246 Change-Id: I96670acd17892d537dd4ff92968ac6dbbf2729a3
2021-03-01Upgrade jsoncpp to 1.9.4Haibo Huang
Bug: 170642246 Change-Id: Id1fae5a1b6421117f923c616718ee4b3571231e0
2021-03-01Merge "Add janitors and jophba@ to OWNERS"Haibo Huang
2021-03-01Add janitors and jophba@ to OWNERSHaibo Huang
Change-Id: If20587e355269b82e6e621ff698b2535879a9d84
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 2518b1d923 -s ↵Xin Li
ours am: 7f445bd55c -s ours am skip reason: Change-Id I6f608a8bc3cf979bf340cb6ba745eeeb8f02211b with SHA-1 7b493675c6 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iaf28dfd34b6136b4e7cb81ad4823ce0c61a83b26
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 2518b1d923 -s oursXin Li
am skip reason: Change-Id I6f608a8bc3cf979bf340cb6ba745eeeb8f02211b with SHA-1 7b493675c6 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5b71d0e7b98be5e05018c413de9e4648a38037fb
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: I6f608a8bc3cf979bf340cb6ba745eeeb8f02211b Change-Id: Ia9f66d0e3b0998a23e06f9aea446f6698708dd1c
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/jsoncpp" am: 839c129ec5 am: ↵Bob Badour
5439e3a1b4 am: 3fb87af73f Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1588526 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5e4a61d3ea9dd5813430a9c4c88fc38a99676a36
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/jsoncpp" am: 839c129ec5 am: ↵Bob Badour
5439e3a1b4 Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1588526 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7c121de3162881930308dc9c9fcc6815e6b0ea20
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/jsoncpp" am: 839c129ec5Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1588526 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ief811c6b64b67a9217b8c05389bc47c6e97eac87
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/jsoncpp"android-s-preview-1Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/jsoncppBob Badour
Added SPDX-license-identifier-MIT legacy_unencumbered to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I70e7384b82fb5c8f44c50547d96690a41526e419
2020-11-24Mark ab/6881855 as merged am: 2e9e481ad2 am: 7b493675c6Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/jsoncpp/+/13111005 Change-Id: I617bc109a70af834f9a023ceb1333f16ecfa1c1b
2020-11-24Mark ab/6881855 as merged am: 2e9e481ad2Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/jsoncpp/+/13111005 Change-Id: I6f608a8bc3cf979bf340cb6ba745eeeb8f02211b
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I79f43ff709ba65282ade1ce41b98dbe7f2c64ad2
2020-11-12Merge "Add "product_available" to product available modules" am: 007228773d ↵Treehugger Robot
am: 02f12b3567 am: 98a24f2da7 am: d89037ddbd Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1495759 Change-Id: Icfbe10bc32397c6498e84838dcbb963a44cfb2cd
2020-11-12Merge "Add "product_available" to product available modules" am: 007228773d ↵Treehugger Robot
am: 02f12b3567 am: 98a24f2da7 Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1495759 Change-Id: Ibc1b62f6d47392433880f7c4430d5313e0f4a109
2020-11-12Merge "Add "product_available" to product available modules" am: 007228773d ↵Treehugger Robot
am: 02f12b3567 Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1495759 Change-Id: I309d2056c0095974b067cd780215ea6cbf37e937
2020-11-12Merge "Add "product_available" to product available modules" am: 007228773dTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1495759 Change-Id: Ia66494897e281939bcc69347370bcf075e4fc952
2020-11-12Merge "Add "product_available" to product available modules"Treehugger Robot
2020-11-11Add "product_available" to product available modulesJustin Yun
"vendor_available" modules were available to product modules. However, not all "vendor_available" modules are required to be available to product modules. Some modules want to be available only to product modules but not vendor modules. To cover the requirement, we separate "product_available" from "vendor_available". "vendor_available" will not provide product available module. Bug: 150902910 Test: build Change-Id: I5c2dce7f1cac4a1af4e01022bab318ffd7aeae54
2020-11-02Merge "Make {vendor_,}ramdisk_available." am: 2c4c231d25 am: c4fa527a60 am: ↵Yifan Hong
785d101ceb am: 679faeea62 Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1469927 Change-Id: Iaf239bcfebe0f5e39adbb67ccb7974f0f62f466c
2020-11-02Merge "Make {vendor_,}ramdisk_available." am: 2c4c231d25 am: c4fa527a60 am: ↵Yifan Hong
785d101ceb Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1469927 Change-Id: I8c72fbb2f4f67eb22079529f1c028bb0d349d599
2020-11-02Merge "Make {vendor_,}ramdisk_available." am: 2c4c231d25 am: c4fa527a60Yifan Hong
Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1469927 Change-Id: I7e718a005a635cc39aee3768bac5567173628ef7
2020-11-02Merge "Make {vendor_,}ramdisk_available." am: 2c4c231d25Yifan Hong
Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1469927 Change-Id: Id137f08f8d471430e702d249147eb3dd36d3ae77
2020-11-02Merge "Make {vendor_,}ramdisk_available."Yifan Hong
2020-10-21Make {vendor_,}ramdisk_available.Yifan Hong
Test: pass Bug: 156098440 Change-Id: Ibc46f2178c8cd8cf071d2d29772320a28af87f7e
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 02:33:03 +0000