aboutsummaryrefslogtreecommitdiff
path: root/libop
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2011-04-08 12:38:32 -0700
committerJeff Brown <jeffbrown@google.com>2011-04-08 14:31:53 -0700
commit6e67eb0359ee670a3eccd17dcc7eb0ffa3531d7b (patch)
tree6d74cab844202f74691ce399c376db2d28df2808 /libop
parentf06448bab14aaf2822dc8360c44387ff8115281a (diff)
downloadoprofile-6e67eb0359ee670a3eccd17dcc7eb0ffa3531d7b.tar.gz
Reenable oprofile host build.
Now taking into account differences in the library dependencies of libintl on darwin vs. linux. On darwin, we need to link with libiconv which is provided as a shared library on the platform. On linux, iconv is included in libc so we don't need anything special. Change-Id: Ide89061cce0352c83b7401d9f5d594e9625b1868
Diffstat (limited to 'libop')
-rw-r--r--libop/Android.mk5
1 files changed, 2 insertions, 3 deletions
diff --git a/libop/Android.mk b/libop/Android.mk
index c402bc5..9ad4664 100644
--- a/libop/Android.mk
+++ b/libop/Android.mk
@@ -33,7 +33,7 @@ LOCAL_SRC_FILES:= $(common_src)
LOCAL_C_INCLUDES := $(common_target_c_includes)
LOCAL_CFLAGS := $(common_target_cflags)
LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libop
+LOCAL_MODULE := liboprofile_op
include $(BUILD_STATIC_LIBRARY)
@@ -44,9 +44,8 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES:= $(common_src)
LOCAL_C_INCLUDES := $(common_host_c_includes)
LOCAL_CFLAGS := $(common_host_cflags)
-LOCAL_LDFLAGS := $(common_host_ldflags)
LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libop
+LOCAL_MODULE := liboprofile_op
include $(BUILD_HOST_STATIC_LIBRARY)
endif