summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Palevich <jackpal@google.com>2009-11-12 14:57:50 +0800
committerJack Palevich <jackpal@google.com>2009-11-12 14:57:50 +0800
commit464407588fce5991b7e6e654695f0665d7f2d008 (patch)
treeb68bab2251a318dc1648a0e55a1530760d8d15d8
parent13edb721c0a933b943f77385c412563c26425c05 (diff)
downloadsystem_core-464407588fce5991b7e6e654695f0665d7f2d008.zip
system_core-464407588fce5991b7e6e654695f0665d7f2d008.tar.gz
system_core-464407588fce5991b7e6e654695f0665d7f2d008.tar.bz2
Build acc tool with static rather than shared library.
OS X does not allow relative shared library path names in compiled apps, so we have to create and link with a static library version of libacc.
-rw-r--r--libacc/Android.mk4
-rw-r--r--libacc/tests/Android.mk5
2 files changed, 5 insertions, 4 deletions
diff --git a/libacc/Android.mk b/libacc/Android.mk
index 2b4998e..5101e16 100644
--- a/libacc/Android.mk
+++ b/libacc/Android.mk
@@ -11,7 +11,7 @@ LOCAL_SHARED_LIBRARIES := libdl libcutils
include $(BUILD_SHARED_LIBRARY)
-# Shared library for host
+# Static library for host
# ========================================================
include $(CLEAR_VARS)
@@ -23,7 +23,7 @@ LOCAL_CFLAGS := -O0 -g
LOCAL_STATIC_LIBRARIES := libcutils
LOCAL_LDLIBS := -ldl
-include $(BUILD_HOST_SHARED_LIBRARY)
+include $(BUILD_HOST_STATIC_LIBRARY)
# Build children
# ========================================================
diff --git a/libacc/tests/Android.mk b/libacc/tests/Android.mk
index b3af6f1..9188edb 100644
--- a/libacc/tests/Android.mk
+++ b/libacc/tests/Android.mk
@@ -8,8 +8,9 @@ LOCAL_MODULE:= acc
LOCAL_SRC_FILES:= \
main.cpp
-LOCAL_SHARED_LIBRARIES := \
- libacc
+LOCAL_STATIC_LIBRARIES := \
+ libacc \
+ libcutils
LOCAL_MODULE_TAGS := tests