Convert Android.mk to Android.bp
Test: None. This just converts the makefile
Add host_supported, so it can be used on device and on host.
Skia is in progress of converting its test apps to using Android.bp.
They rely on libjsoncpp, so it needs to be built with Android.bp, too.
Change-Id: Ie2cfc3ba95be063cb5e4c82a111767902100e070
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 bfee716..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-LOCAL_PATH:= $(call my-dir)
-
-# Device library
-# ================================================
-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)
-
-
-
-# Host library
-# ================================================
-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 := \
- libjsoncpp
-
-include $(BUILD_HOST_STATIC_LIBRARY)
-
-
-
