commit 2d51233a7a1c823dbd2e10bde4b860130fc33a8e
author android-build-team Robot <android-build-team-robot@google.com> Thu Mar 22 07:24:42 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Mar 22 07:24:42 2018 +0000
tree fbffb54c6115663f190dda850a2e194890ff7263
parent 93712dcf8ff2a4d2a9c4f02d5e5de7b1120c9f7f
parent fd78d1f820fafb50dc6b8e72fbe3a0a0f9f2061c

Snap for 4670666 from fd78d1f820fafb50dc6b8e72fbe3a0a0f9f2061c to pi-release

Change-Id: Iab30bc6e7f27202b3a17e13fbf1a0ef1f8298264

Android.bp

diff --git a/Android.bp b/Android.bp
index e5df946..4f16430 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,7 +1,5 @@
-cc_library_static {
-    name: "libjsoncpp",
-    vendor_available: true,
-    host_supported: true,
+cc_defaults {
+    name: "libjsoncpp_defaults",
 
     srcs: [
         "src/lib_json/json_reader.cpp",
@@ -27,3 +25,17 @@
         },
     },
 }
+
+cc_library_static {
+    name: "libjsoncpp",
+    defaults: ["libjsoncpp_defaults"],
+    vendor_available: true,
+    host_supported: true,
+}
+
+cc_library_static {
+    name: "libjsoncpp_ndk",
+    defaults: ["libjsoncpp_defaults"],
+    sdk_version: "9",
+    stl: "libc++_static",
+}