aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2023-06-20 23:07:26 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-06-20 23:07:26 +0000
commit1d5c303d7a98e479179a055bd37297776f3969a3 (patch)
treed46bafba72891dc7f36c6a3b8df070e31cdef9dc
parent22d33955e4c2525e659f729c9f02afe09183b107 (diff)
parentfb1d0dcd6085ef90086412f101c49f8bd0c81b73 (diff)
downloadjsoncpp-1d5c303d7a98e479179a055bd37297776f3969a3.tar.gz
Merge "Compile jsoncpp for Mac OS X" am: 412931e954 am: f62be7257b am: 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>
-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,
},