aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2023-06-21 00:57:26 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-06-21 00:57:26 +0000
commit8d9bb112388603ff5e416dc6fd98278c60ada8e0 (patch)
treed46bafba72891dc7f36c6a3b8df070e31cdef9dc
parent22d33955e4c2525e659f729c9f02afe09183b107 (diff)
parentaaee24528d79e54f3182e8acb2da1954d5b869f5 (diff)
downloadjsoncpp-android14-qpr2-s3-release.tar.gz
Merge "Compile jsoncpp for Mac OS X" am: 412931e954 am: f62be7257b am: fb1d0dcd60 am: 1d5c303d7a am: bfcabbdf8b am: aaee24528dandroid-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release
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>
-rw-r--r--Android.bp3
1 files changed, 3 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index 03e8ac1..69e24f9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -55,6 +55,9 @@ cc_defaults {
],
target: {
+ darwin: {
+ enabled: true,
+ },
windows: {
enabled: true,
},