diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-09-09 16:45:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-09-09 16:45:30 +0000 |
| commit | bd3c8f83c2149b809adb54dcbfd430e49a008bed (patch) | |
| tree | 638b917642411b9358afbc619c993e31143cadd1 | |
| parent | 4949b8a792682f59a573fa87ec20b14e850af273 (diff) | |
| parent | d573a911eb98cf92855b2afa84ffcf1a404cc414 (diff) | |
| download | tinyxml-bd3c8f83c2149b809adb54dcbfd430e49a008bed.tar.gz | |
Merge "Remove static implementations of libtinyxml"
| -rw-r--r-- | Android.mk | 33 |
1 files changed, 2 insertions, 31 deletions
@@ -5,6 +5,8 @@ # Add -DTIXML_USE_STL to CFLAGS to use STL. # +LOCAL_PATH := $(call my-dir) + commonSources:= \ tinyxml.cpp \ tinyxmlparser.cpp \ @@ -17,37 +19,6 @@ commonFlags := \ -Wno-logical-op-parentheses \ -Werror -# For the host -# ===================================================== -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES:= \ - $(commonSources) - -LOCAL_MODULE:= libtinyxml - -LOCAL_CFLAGS+= $(TOOL_CFLAGS) $(commonFlags) -LOCAL_LDFLAGS:= $(TOOL_LDFLAGS) -lstdc++ -lc - -LOCAL_MULTILIB := both - -include $(BUILD_HOST_STATIC_LIBRARY) - - -# For the device (static) -# ===================================================== -include $(CLEAR_VARS) - -LOCAL_SRC_FILES:= \ - $(commonSources) - -LOCAL_MODULE:= libtinyxml - -LOCAL_CFLAGS+= $(commonFlags) - -include $(BUILD_STATIC_LIBRARY) - # For the device # ===================================================== |