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
diff --git a/pp/Android.mk b/pp/Android.mk
index 16d119d..b5d2e0a 100644
--- a/pp/Android.mk
+++ b/pp/Android.mk
@@ -19,17 +19,19 @@
common_src := common_option.cpp
common_libs := \
- libpp \
- libop \
- libutil \
- libdb \
- libop_regex \
- libopt++ \
- libutil++ \
- libpopt \
- libz
+ liboprofile_pp \
+ liboprofile_db \
+ liboprofile_op_regex \
+ liboprofile_opt++ \
+ liboprofile_util++ \
+ liboprofile_popt \
+ liboprofile_op \
+ liboprofile_util \
+ libbfd \
+ libiberty \
+ libintl
-common_ldlibs := -lbfd -liberty -lintl -liconv
+common_ldlibs := -lz $(common_host_ldlibs_libiconv)
ifeq ($(HAVE_LIBBFD),true)
@@ -44,7 +46,6 @@
LOCAL_STATIC_LIBRARIES := $(common_libs)
LOCAL_C_INCLUDES := $(common_host_c_includes)
LOCAL_CFLAGS := $(common_host_cflags)
-LOCAL_LDFLAGS := $(common_host_ldflags)
LOCAL_LDLIBS := $(common_ldlibs)
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE:= opreport
@@ -62,7 +63,6 @@
LOCAL_STATIC_LIBRARIES := $(common_libs)
LOCAL_C_INCLUDES := $(common_host_c_includes)
LOCAL_CFLAGS := $(common_host_cflags)
-LOCAL_LDFLAGS := $(common_host_ldflags)
LOCAL_LDLIBS := $(common_ldlibs)
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE:= opannotate
@@ -80,7 +80,6 @@
LOCAL_STATIC_LIBRARIES := $(common_libs)
LOCAL_C_INCLUDES := $(common_host_c_includes)
LOCAL_CFLAGS := $(common_host_cflags)
-LOCAL_LDFLAGS := $(common_host_ldflags)
LOCAL_LDLIBS := $(common_ldlibs)
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE:= opgprof
@@ -98,7 +97,6 @@
LOCAL_STATIC_LIBRARIES := $(common_libs)
LOCAL_C_INCLUDES := $(common_host_c_includes)
LOCAL_CFLAGS := $(common_host_cflags)
-LOCAL_LDFLAGS := $(common_host_ldflags)
LOCAL_LDLIBS := $(common_ldlibs)
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE:= oparchive