aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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: c509e9a48c -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: I234dc972624fdd6bd64cea034e759fa254d3fa3d
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 2518b1d923 -s ↵Xin Li
ours am: 7f445bd55c -s ours am: c509e9a48c -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: Ia27e2ac8145b9c4b55ed3ef207f2ac5c168ad164
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 am: b3a7c844a4 Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1588526 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0fce3bdd02a76936e65f2a37f1a3d4002d68b321
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/jsoncpp" am: 839c129ec5 am: ↵Bob Badour
5439e3a1b4 am: 3fb87af73f am: b3a7c844a4 Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1588526 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3d77378f1f784e7cfa37fb4dcd9e2721a18bb308
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
2020-04-29Merge "Add METADATA to jsoncpp: MIT=NOTICE" am: 8c04555edf am: 60f1d43927 ↵Treehugger Robot
am: f5b9450d34 am: d02f230384 am: 559df4121c Change-Id: I918ddf14c25b503dce8981ddb7548274b7006c6b
2020-04-29Merge "Add METADATA to jsoncpp: MIT=NOTICE" am: 8c04555edf am: 60f1d43927 ↵Treehugger Robot
am: f5b9450d34 am: d02f230384 Change-Id: Ibfea442b02ecd5ab8f83fe82573849648af13355
2020-04-29Merge "Add METADATA to jsoncpp: MIT=NOTICE" am: 8c04555edf am: 60f1d43927 ↵Treehugger Robot
am: f5b9450d34 Change-Id: Ia0f56e187c1f37aa6077e86a1afe760baee6f951
2020-04-29Merge "Add METADATA to jsoncpp: MIT=NOTICE" am: 8c04555edf am: 60f1d43927Treehugger Robot
Change-Id: Iff029179c344af7d45a58e94e1161214022372c7
2020-04-29Merge "Add METADATA to jsoncpp: MIT=NOTICE" am: 8c04555edfandroid-r-beta-3android-r-beta-2Treehugger Robot
Change-Id: Ic514fd065395bcc2c1acba90b80a9e4d606f04c3
2020-04-29Merge "Add METADATA to jsoncpp: MIT=NOTICE"Treehugger Robot
2020-04-28Add METADATA to jsoncpp: MIT=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I587d8d2dd25286816a4cce4ef913d63bcc2064b3
2020-04-27[automerger skipped] Set min_sdk_version to be part of mainline modules am: ↵Jooyung Han
3c3f271211 am: 85efb03d15 am: ceed690fef am: da48ed3697 -s ours am: d2a41c732a -s ours am skip reason: Change-Id I6e251b193a1ee4dc868b17a67b0d730ecd678d8b with SHA-1 3c3f271211 is in history Change-Id: Icc7cb5c3910ab66821e647cfa4f6eafc06d4109d
2020-04-27[automerger skipped] Set min_sdk_version to be part of mainline modules am: ↵Jooyung Han
3c3f271211 -s ours am: 6720519367 -s ours am: 5ed81a9eaa -s ours am: 5ba6810f04 -s ours am skip reason: Change-Id I6e251b193a1ee4dc868b17a67b0d730ecd678d8b with SHA-1 3c3f271211 is in history Change-Id: I30ad472301f5f1370b868cd12726799d0a89b06d
2020-04-27[automerger skipped] Set min_sdk_version to be part of mainline modules am: ↵Jooyung Han
3c3f271211 am: 85efb03d15 -s ours am: 6b5565b85f -s ours am: 639a926130 -s ours am skip reason: Change-Id I6e251b193a1ee4dc868b17a67b0d730ecd678d8b with SHA-1 3671db5c13 is in history Change-Id: I473741a46d9c82e6768dc9d8214e2ee1b473d925
2020-04-27[automerger skipped] Set min_sdk_version to be part of mainline modules am: ↵Jooyung Han
3c3f271211 am: 85efb03d15 am: ceed690fef am: da48ed3697 -s ours am skip reason: Change-Id I6e251b193a1ee4dc868b17a67b0d730ecd678d8b with SHA-1 3c3f271211 is in history Change-Id: I4c0703e340f09752d996554deb670e1e71ae5f1a
2020-04-27[automerger skipped] Set min_sdk_version to be part of mainline modules am: ↵Jooyung Han
3c3f271211 -s ours am: 6720519367 -s ours am: 5ed81a9eaa -s ours am skip reason: Change-Id I6e251b193a1ee4dc868b17a67b0d730ecd678d8b with SHA-1 3c3f271211 is in history Change-Id: Ia1834d3cf560575e2abe06539c37c4c13ca73567
2020-04-27[automerger skipped] Set min_sdk_version to be part of mainline modules am: ↵Jooyung Han
3c3f271211 am: 85efb03d15 -s ours am: 6b5565b85f -s ours am skip reason: Change-Id I6e251b193a1ee4dc868b17a67b0d730ecd678d8b with SHA-1 3671db5c13 is in history Change-Id: Iee6d1c4772cb8b23ceb13cd2fd920984f3bef0ff
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 05:09:40 +0000