diff options
author | Xin Li <delphij@google.com> | 2018-06-08 11:07:11 -0700 |
---|---|---|
committer | Xin Li <delphij@google.com> | 2018-06-08 11:07:11 -0700 |
commit | 1a1096f12bccc2f742ca24ac7dbb7d3588054d41 (patch) | |
tree | fbffb54c6115663f190dda850a2e194890ff7263 | |
parent | 82904944c860c953961f0ebb935c5a8c6d02a91e (diff) | |
parent | 0d05cd931476e43c60b8b9ceb81e68d3202a368a (diff) | |
download | jsoncpp-1a1096f12bccc2f742ca24ac7dbb7d3588054d41.tar.gz |
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-mastertemp_p_merge
Bug: 79597307
Change-Id: I79c5115f08b0d3f684eb38efe00a751f363ed965
-rw-r--r-- | Android.bp | 20 |
1 files changed, 16 insertions, 4 deletions
@@ -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", +} |