Convert Android.mk to Android.bpandroid-vts-8.0_r9android-vts-8.0_r8android-vts-8.0_r7android-vts-8.0_r6android-vts-8.0_r2android-vts-8.0_r13android-vts-8.0_r12android-vts-8.0_r11android-vts-8.0_r10android-vts-8.0_r1android-security-8.0.0_r54android-security-8.0.0_r53android-security-8.0.0_r52android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r26android-cts-8.0_r25android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r51android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r34android-8.0.0_r33android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r27android-8.0.0_r26android-8.0.0_r25android-8.0.0_r24android-8.0.0_r23android-8.0.0_r22android-8.0.0_r21android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releaseoreo-vts-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-dr3-releaseoreo-dr2-releaseoreo-dr1-releaseoreo-devoreo-cts-release

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

2 files changed, 21 insertions, 59 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 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)
-
-
-