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