commit | 8d9bb112388603ff5e416dc6fd98278c60ada8e0 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <[email protected]> | Wed Jun 21 00:57:26 2023 +0000 |
committer | Automerger Merge Worker <[email protected]> | Wed Jun 21 00:57:26 2023 +0000 |
tree | d46bafba72891dc7f36c6a3b8df070e31cdef9dc | |
parent | 22d33955e4c2525e659f729c9f02afe09183b107 [diff] | |
parent | aaee24528d79e54f3182e8acb2da1954d5b869f5 [diff] |
Merge "Compile jsoncpp for Mac OS X" am: 412931e954 am: f62be7257b am: fb1d0dcd60 am: 1d5c303d7a am: bfcabbdf8b am: aaee24528d Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/2629350 Change-Id: Ie75542799fe542081ba56d55909308a1c1769485 Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/Android.bp b/Android.bp index 03e8ac1..69e24f9 100644 --- a/Android.bp +++ b/Android.bp
@@ -55,6 +55,9 @@ ], target: { + darwin: { + enabled: true, + }, windows: { enabled: true, },