summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2013-05-02 09:46:11 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-02 09:46:11 -0700
commit5e6b976417501fcbac0fe539f479885cb9795a70 (patch)
tree257c123297dff43451f51c6e9af02db1dedd9058
parentee26fc15929c2a6579466063b099c7db7ba17708 (diff)
parentd062392d484cf6ca7f4b3eb9032d8237f8eb63fd (diff)
downloadexpat-5e6b976417501fcbac0fe539f479885cb9795a70.tar.gz
am d062392d: Merge "Give unique name to host build shared libraries"
* commit 'd062392d484cf6ca7f4b3eb9032d8237f8eb63fd': Give unique name to host build shared libraries
-rw-r--r--Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index 8a680ff5..61dde980 100644
--- a/Android.mk
+++ b/Android.mk
@@ -53,7 +53,7 @@ ifeq ($(HOST_OS),darwin)
LOCAL_CFLAGS += -fno-common
endif
-LOCAL_MODULE:= libexpat
+LOCAL_MODULE:= libexpat-host
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_MODULE_TAGS := optional
LOCAL_COPY_HEADERS_TO := $(common_COPY_HEADERS_TO)