aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2023-06-20 23:51:28 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-06-20 23:51:28 +0000
commitbfcabbdf8b567c6ceee6c42ccf954310a0b2b0ea (patch)
treed46bafba72891dc7f36c6a3b8df070e31cdef9dc
parent22d33955e4c2525e659f729c9f02afe09183b107 (diff)
parent1d5c303d7a98e479179a055bd37297776f3969a3 (diff)
downloadjsoncpp-bfcabbdf8b567c6ceee6c42ccf954310a0b2b0ea.tar.gz
Merge "Compile jsoncpp for Mac OS X" am: 412931e954 am: f62be7257b am: fb1d0dcd60 am: 1d5c303d7a
Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/2629350 Change-Id: I8c1fdcedd5f1f1270506eea9a4986c703b64c4bf 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,
},