diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-04-20 04:44:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-04-20 04:44:17 +0000 |
| commit | ecd640d0acf7c93c5dbfc37702e4eedbc18aa850 (patch) | |
| tree | aff91f26bf5545b363339de703204ee0393c8689 | |
| parent | 90c81b9c9aef09ef4ffb8de1779301734336d897 (diff) | |
| parent | 2d4f6c95758e03390f9155d6f33bc1891a0a37d0 (diff) | |
| download | jsoncpp-o-iot-preview-5.tar.gz | |
Merge changes Ie2cfc3ba,Id4f9d512android-wear-o-preview-4android-wear-o-preview-3android-o-preview-4android-o-preview-3android-o-preview-2android-o-iot-preview-5android-n-iot-preview-4o-iot-preview-5n-iot-preview-4
* changes:
Convert Android.mk to Android.bp
Compile libjsoncpp for the host too.
| -rw-r--r-- | Android.bp | 21 | ||||
| -rw-r--r-- | Android.mk | 27 |
2 files changed, 21 insertions, 27 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..8240f6b --- /dev/null +++ b/Android.bp @@ -0,0 +1,21 @@ +cc_library_static { + + name: "libjsoncpp", + + host_supported: true, + + srcs: [ + "src/lib_json/json_reader.cpp", + "src/lib_json/json_value.cpp", + "src/lib_json/json_writer.cpp", + ], + + local_include_dirs: [ + "src/lib_json", + ], + + export_include_dirs: ["include"], + + cflags: ["-DJSON_USE_EXCEPTION=0"], + +} diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 21f84ea..0000000 --- a/Android.mk +++ /dev/null @@ -1,27 +0,0 @@ -BASE_PATH := $(call my-dir) -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES:= \ - src/lib_json/json_reader.cpp \ - src/lib_json/json_value.cpp \ - src/lib_json/json_writer.cpp - -LOCAL_C_INCLUDES:= \ - $(LOCAL_PATH)/include \ - $(LOCAL_PATH)/src/lib_json - -LOCAL_EXPORT_C_INCLUDE_DIRS := \ - $(LOCAL_PATH)/include - -LOCAL_CFLAGS := \ - -DJSON_USE_EXCEPTION=0 - -LOCAL_MODULE_TAGS := \ - tests - -LOCAL_MODULE := \ - libjsoncpp - -include $(BUILD_STATIC_LIBRARY) |