diff options
author | Dan Willemsen <dwillemsen@google.com> | 2017-09-09 17:01:23 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-09-09 17:01:23 +0000 |
commit | 119ea69917f3e06692de2a4430c291487eb74eba (patch) | |
tree | 638b917642411b9358afbc619c993e31143cadd1 | |
parent | 9c03b0d3820d7496c2ea62efade5cdf1853c245b (diff) | |
parent | 366a573817de93aa809c8d2fc23909e4c07c8ec7 (diff) | |
download | tinyxml-119ea69917f3e06692de2a4430c291487eb74eba.tar.gz |
Merge "Remove static implementations of libtinyxml" am: bd3c8f83c2 am: c1b9f4cb12android-wear-p-preview-2android-wear-8.0.0_r1android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8o-mr1-iot-preview-7
am: 366a573817
Change-Id: Ibec32b05a1280456e6f4e2cbfefc7415bd9f8fc1
-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 # ===================================================== |