diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2018-11-20 12:33:06 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-11-20 12:33:06 -0800 |
| commit | df0be3b3ed3f13d7c9ce9831ca6f8bb5f6d33989 (patch) | |
| tree | 2dfddf1445db0a7e8612d3b0b5993af101309596 | |
| parent | 0b1baab1cf61f3e6e25aa10f1d4d8a6b2be76fb5 (diff) | |
| parent | a0d35048a6c0c31f76c8098282c06b7d6c057b43 (diff) | |
| download | tinyxml-df0be3b3ed3f13d7c9ce9831ca6f8bb5f6d33989.tar.gz | |
Merge "Convert libtinyxml to Android.bp" am: 040807802b
am: a0d35048a6
Change-Id: I3c6f0070375dd52f286f65ad66d7ef31801e49b8
| -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) - - |