Snap for 5234541 from 036edaff393cd471046e0ef2eba1f7efbebecf86 to sdk-release

Change-Id: I66b1bb7072efb6c0357652aca6da34d1a2d16fc9

3 files changed, 32 insertions, 38 deletions

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..4651d1f
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,29 @@
+// Copyright 2005 The Android Open Source Project
+//
+// Android.mk for TinyXml.
+//
+// Add -DTIXML_USE_STL to CFLAGS to use STL.
+//
+
+// For the device
+// =====================================================
+cc_library_shared {
+    name: "libtinyxml",
+
+    srcs: [
+        "tinyxml.cpp",
+        "tinyxmlparser.cpp",
+        "tinyxmlerror.cpp",
+        "tinystr.cpp",
+    ],
+
+    vendor: true,
+
+    cflags: [
+        "-Wno-implicit-fallthrough",
+        "-Wno-logical-op-parentheses",
+        "-Wno-missing-braces",
+        "-Wno-undefined-bool-conversion",
+        "-Werror",
+    ],
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index b3967a5..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2005 The Android Open Source Project
-#
-# Android.mk for TinyXml.
-#
-# Add -DTIXML_USE_STL to CFLAGS to use STL.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-commonSources:= \
-	tinyxml.cpp \
-	tinyxmlparser.cpp \
-	tinyxmlerror.cpp \
-	tinystr.cpp
-
-commonFlags := \
-	-Wno-undefined-bool-conversion \
-	-Wno-missing-braces \
-        -Wno-logical-op-parentheses \
-        -Werror
-
-
-# For the device
-# =====================================================
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:= \
-	$(commonSources)
-
-LOCAL_MODULE:= libtinyxml
-
-LOCAL_VENDOR_MODULE := true
-
-LOCAL_CFLAGS+= $(commonFlags)
-
-include $(BUILD_SHARED_LIBRARY)
-
-
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..244c628
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,3 @@
+# Default code reviewers picked from top 3 or more developers.
+# Please update this list if you find better candidates.
+enh@google.com