aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Muir <muirj@google.com>2017-10-18 18:00:51 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-10-18 18:00:51 +0000
commita10332b83510b8bbe0cd3542495b821fb43096ba (patch)
tree0aff49d44b97b0e8c9fafb18e7ab06abcbfd02eb
parent5ef173c620f2f7627a3c54d2ad2fa1720523f218 (diff)
parentad00d2971e82d94e680b4f75f8b224067a40dacf (diff)
downloadjsoncpp-o-mr1-iot-preview-6.tar.gz
Merge "jsoncpp: Allow windows binaries."android-o-mr1-iot-preview-6o-mr1-iot-preview-6
am: ad00d2971e Change-Id: I059dc6ace4f1266765e5cb66f56d2639627d1b7e
-rw-r--r--Android.bp6
1 files changed, 6 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index d0550f1..b294db5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -21,4 +21,10 @@ cc_library_static {
"-Wall",
"-Werror",
],
+
+ target: {
+ windows: {
+ enabled: true,
+ },
+ },
}