aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerek Sollenberger <djsollen@google.com>2018-01-31 13:27:11 -0500
committerDerek Sollenberger <djsollen@google.com>2018-03-21 08:31:58 -0400
commitfd78d1f820fafb50dc6b8e72fbe3a0a0f9f2061c (patch)
treefbffb54c6115663f190dda850a2e194890ff7263
parent12f62f1c93425ec51f542779d205266dd787d56f (diff)
downloadjsoncpp-pie-qpr1-s2-release.tar.gz
Setting this enables our testing tools that must be SDK/NDK compliant to include these static libs in their builds. Bug: 74442448 Test: compile and CtsSkQPTestCases Change-Id: I0dc742c6c177a99e662af171bd41f789cf51a48f
-rw-r--r--Android.bp20
1 files changed, 16 insertions, 4 deletions
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 {
},
},
}
+
+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",
+}