commit 119ea69917f3e06692de2a4430c291487eb74eba
author Dan Willemsen <dwillemsen@google.com> Sat Sep 09 17:01:23 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat Sep 09 17:01:23 2017 +0000
tree 638b917642411b9358afbc619c993e31143cadd1
parent 9c03b0d3820d7496c2ea62efade5cdf1853c245b
parent 366a573817de93aa809c8d2fc23909e4c07c8ec7

Merge "Remove static implementations of libtinyxml" am: bd3c8f83c2 am: c1b9f4cb12
am: 366a573817

Change-Id: Ibec32b05a1280456e6f4e2cbfefc7415bd9f8fc1

Android.mk

diff --git a/Android.mk b/Android.mk
index 6a93c0d..b3967a5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -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 @@
         -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
 # =====================================================