diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-09-09 16:55:58 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-09 16:55:58 +0000 |
| commit | 366a573817de93aa809c8d2fc23909e4c07c8ec7 (patch) | |
| tree | 638b917642411b9358afbc619c993e31143cadd1 | |
| parent | 9c03b0d3820d7496c2ea62efade5cdf1853c245b (diff) | |
| parent | c1b9f4cb1286dd01048d90e16e81670a817ed8c7 (diff) | |
| download | tinyxml-366a573817de93aa809c8d2fc23909e4c07c8ec7.tar.gz | |
Merge "Remove static implementations of libtinyxml" am: bd3c8f83c2
am: c1b9f4cb12
Change-Id: Ic50513beb45420a131f21e1615fd98208dfd2309
| -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 # ===================================================== |