diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-11-20 20:17:14 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-11-20 20:17:14 +0000 |
commit | 040807802b79749d6375e3c1c1857c952f14209e (patch) | |
tree | 2dfddf1445db0a7e8612d3b0b5993af101309596 | |
parent | e51ea40669eb402cd96c09ba7117c43c6c10768c (diff) | |
parent | 7ba4a26e551b83c16805ae31a9b7c3d2f3057cf0 (diff) | |
download | tinyxml-040807802b79749d6375e3c1c1857c952f14209e.tar.gz |
Merge "Convert libtinyxml to Android.bp"android-wear-8.0.0_r2android-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-n-iot-release-ihome-igv1nougat-iot-release
-rw-r--r-- | Android.bp | 29 | ||||
-rw-r--r-- | Android.mk | 39 |
2 files changed, 29 insertions, 39 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 bf735c4..0000000 --- a/Android.mk +++ /dev/null @@ -1,39 +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-implicit-fallthrough \ - -Wno-logical-op-parentheses \ - -Wno-missing-braces \ - -Wno-undefined-bool-conversion \ - -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) - - |