diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-09-09 17:06:28 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-09 17:06:28 +0000 |
| commit | 7a1184d68cdd33245efc9875b237fcef2c9d2c54 (patch) | |
| tree | 638b917642411b9358afbc619c993e31143cadd1 | |
| parent | 9c03b0d3820d7496c2ea62efade5cdf1853c245b (diff) | |
| parent | 119ea69917f3e06692de2a4430c291487eb74eba (diff) | |
| download | tinyxml-pie-qpr1-s1-release.tar.gz | |
Merge "Remove static implementations of libtinyxml" am: bd3c8f83c2 am: c1b9f4cb12 am: 366a573817android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-dev
am: 119ea69917
Change-Id: I4ea53aef1f9d94a88c31a841f41122da199cfdc8
| -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 # ===================================================== |