commit ae1b264719e04aab68878e2b50ab47a699cabce3
author Xin Li <delphij@google.com> Mon Aug 06 16:50:35 2018 -0700
committer Xin Li <delphij@google.com> Mon Aug 06 16:50:35 2018 -0700
tree fbffb54c6115663f190dda850a2e194890ff7263
parent ba99b11181c0c9bad38d87c6404e1c8ce9591b9b
parent 1a1096f12bccc2f742ca24ac7dbb7d3588054d41

Merge Android Pie into master

Bug: 112104996
Change-Id: I722816616ab2becfd328485c0a10da0351a29ca3

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",
+}