commit 121749182e42c4c27e876361bae85c4485b327af
author Colin Cross <ccross@android.com> Tue Jul 12 21:37:49 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 12 21:37:49 2016 +0000
tree 5368e402f4dab941b3231e48c6a703f53e475f23
parent 1f991a379eb05f38cf34406c6d6dbd3e6ea1cbfe
parent da559c7cdb0a9ba18fda6fa4488586ded8a5f3c1

Merge "Convert Android.mk to Android.bp"

Android.bp

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..0e53e7f
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,16 @@
+cc_library_static {
+    name: "libtinyxml2",
+    host_supported: true,
+
+    srcs: ["tinyxml2.cpp"],
+
+    target: {
+        android: {
+            cflags: [
+                // LOG_TO_ANDROID_LOGCAT
+                "-DDEBUG",
+                "-DANDROID_NDK",
+            ],
+        },
+    },
+}

Android.mk

diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index da1d16c..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-LOG_TO_ANDROID_LOGCAT := true
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:= tinyxml2.cpp
-
-LOCAL_MODULE:=libtinyxml2
-LOCAL_MODULE_TAGS := optional
-
-ifeq ($(LOG_TO_ANDROID_LOGCAT),true)
-LOCAL_CFLAGS+= -DDEBUG -DANDROID_NDK
-endif
-
-include $(BUILD_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:= tinyxml2.cpp
-
-LOCAL_MODULE:=libtinyxml2
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_HOST_STATIC_LIBRARY)