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/common.mk b/common.mk
index 8ecf469..4e431d5 100644
--- a/common.mk
+++ b/common.mk
@@ -32,21 +32,22 @@
common_target_cflags := $(common_cflags)
# Common host flags
-# FIXME: Temporarily disabled until we get libiconv.a in the prebuilts.
-#ifeq ($(strip $(TARGET_ARCH)),arm)
-#toolchain := prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-linux-androideabi-4.4.x
-#HAVE_LIBBFD := true
-#else
HAVE_LIBBFD := false
-#endif
-ifeq ($(HAVE_LIBBFD),true)
+ifeq ($(TARGET_ARCH),arm)
+toolchain := prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-linux-androideabi-4.4.x
common_host_c_includes := $(common_c_includes) $(toolchain)/include
+common_host_cflags := $(common_cflags) -fexceptions -DANDROID_HOST -DHAVE_XCALLOC
+common_host_ldlibs_libiconv :=
-common_host_cflags = $(common_cflags) -fexceptions -DANDROID_HOST -DHAVE_XCALLOC
-ifneq ($(HOST_OS),linux)
+ifeq ($(HOST_OS)-$(HOST_ARCH),darwin-x86)
+HAVE_LIBBFD := true
common_host_cflags += -DMISSING_MREMAP
+common_host_ldlibs_libiconv := -liconv
+else
+ifeq ($(HOST_OS)-$(HOST_ARCH),linux-x86)
+HAVE_LIBBFD := true
+endif
endif
-common_host_ldflags := -L$(toolchain)/lib
endif
diff --git a/daemon/Android.mk b/daemon/Android.mk
index c68c3fe..fd46707 100644
--- a/daemon/Android.mk
+++ b/daemon/Android.mk
@@ -36,7 +36,12 @@
opd_trans.c \
oprofiled.c
-LOCAL_STATIC_LIBRARIES := libpopt libutil libdb libabi libop
+LOCAL_STATIC_LIBRARIES := \
+ liboprofile_popt \
+ liboprofile_util \
+ liboprofile_db \
+ liboprofile_abi \
+ liboprofile_op
LOCAL_C_INCLUDES := $(common_target_c_includes)
LOCAL_CFLAGS := $(common_target_cflags)
diff --git a/libabi/Android.mk b/libabi/Android.mk
index c0aca14..49b7ca9 100644
--- a/libabi/Android.mk
+++ b/libabi/Android.mk
@@ -25,7 +25,7 @@
LOCAL_C_INCLUDES := $(common_target_c_includes)
LOCAL_CFLAGS := $(common_target_cflags)
LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libabi
+LOCAL_MODULE := liboprofile_abi
include $(BUILD_STATIC_LIBRARY)
@@ -39,9 +39,8 @@
LOCAL_C_INCLUDES := $(common_host_c_includes)
LOCAL_CFLAGS := $(common_host_cflags)
-LOCAL_LDFLAGS := $(common_host_ldflags)
LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libabi
+LOCAL_MODULE := liboprofile_abi
include $(BUILD_HOST_STATIC_LIBRARY)
endif
@@ -53,9 +52,14 @@
LOCAL_SRC_FILES:= opimport.cpp
LOCAL_C_INCLUDES := $(common_host_c_includes)
LOCAL_CFLAGS := $(common_host_cflags)
-LOCAL_LDFLAGS := $(common_host_ldflags)
-LOCAL_STATIC_LIBRARIES := libabi libdb libopt++ libutil libutil++ libpopt
-LOCAL_LDLIBS := -liberty
+LOCAL_STATIC_LIBRARIES := \
+ liboprofile_abi \
+ liboprofile_db \
+ liboprofile_opt++ \
+ liboprofile_util \
+ liboprofile_util++ \
+ liboprofile_popt \
+ libiberty
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := opimport
diff --git a/libdb/Android.mk b/libdb/Android.mk
index 071c609..7f0c645 100644
--- a/libdb/Android.mk
+++ b/libdb/Android.mk
@@ -29,7 +29,7 @@
LOCAL_C_INCLUDES := $(common_target_c_includes)
LOCAL_CFLAGS := $(common_target_cflags)
LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libdb
+LOCAL_MODULE := liboprofile_db
include $(BUILD_STATIC_LIBRARY)
@@ -40,10 +40,9 @@
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 := libdb
+LOCAL_MODULE := liboprofile_db
include $(BUILD_HOST_STATIC_LIBRARY)
endif
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_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 @@
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
diff --git a/libopt++/Android.mk b/libopt++/Android.mk
index f502fda..11938b1 100644
--- a/libopt++/Android.mk
+++ b/libopt++/Android.mk
@@ -22,9 +22,8 @@
LOCAL_SRC_FILES:= popt_options.cpp
LOCAL_C_INCLUDES := $(common_host_c_includes)
LOCAL_CFLAGS := $(common_host_cflags)
-LOCAL_LDFLAGS := $(common_host_ldflags)
LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libopt++
+LOCAL_MODULE := liboprofile_opt++
include $(BUILD_HOST_STATIC_LIBRARY)
endif
diff --git a/libpopt/Android.mk b/libpopt/Android.mk
index 23aaef9..b43753b 100644
--- a/libpopt/Android.mk
+++ b/libpopt/Android.mk
@@ -29,7 +29,7 @@
LOCAL_C_INCLUDES := $(common_target_c_includes)
LOCAL_CFLAGS := $(common_target_cflags)
LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libpopt
+LOCAL_MODULE := liboprofile_popt
include $(BUILD_STATIC_LIBRARY)
@@ -40,9 +40,8 @@
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 := libpopt
+LOCAL_MODULE := liboprofile_popt
include $(BUILD_HOST_STATIC_LIBRARY)
endif
diff --git a/libpp/Android.mk b/libpp/Android.mk
index 5b39252..5bdbafa 100644
--- a/libpp/Android.mk
+++ b/libpp/Android.mk
@@ -44,9 +44,8 @@
LOCAL_C_INCLUDES := $(common_host_c_includes)
LOCAL_CFLAGS := $(common_host_cflags)
-LOCAL_LDFLAGS := $(common_host_ldflags)
LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libpp
+LOCAL_MODULE := liboprofile_pp
include $(BUILD_HOST_STATIC_LIBRARY)
-endif
\ No newline at end of file
+endif
diff --git a/libregex/Android.mk b/libregex/Android.mk
index ba1c4df..0d52195 100644
--- a/libregex/Android.mk
+++ b/libregex/Android.mk
@@ -26,9 +26,8 @@
LOCAL_C_INCLUDES := $(common_host_c_includes)
LOCAL_CFLAGS := $(common_host_cflags)
-LOCAL_LDFLAGS := $(common_host_ldflags)
LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libop_regex
+LOCAL_MODULE := liboprofile_op_regex
include $(BUILD_HOST_STATIC_LIBRARY)
endif
diff --git a/libutil++/Android.mk b/libutil++/Android.mk
index 8657780..d6f1045 100644
--- a/libutil++/Android.mk
+++ b/libutil++/Android.mk
@@ -37,9 +37,8 @@
LOCAL_C_INCLUDES := $(common_host_c_includes)
LOCAL_CFLAGS := $(common_host_cflags)
-LOCAL_LDFLAGS := $(common_host_ldflags)
LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libutil++
+LOCAL_MODULE := liboprofile_util++
include $(BUILD_HOST_STATIC_LIBRARY)
-endif
\ No newline at end of file
+endif
diff --git a/libutil/Android.mk b/libutil/Android.mk
index d1d8d65..efbd710 100644
--- a/libutil/Android.mk
+++ b/libutil/Android.mk
@@ -35,7 +35,7 @@
LOCAL_C_INCLUDES := $(common_target_c_includes)
LOCAL_CFLAGS := $(common_target_cflags)
LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libutil
+LOCAL_MODULE := liboprofile_util
include $(BUILD_STATIC_LIBRARY)
@@ -46,9 +46,8 @@
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 := libutil
+LOCAL_MODULE := liboprofile_util
include $(BUILD_HOST_STATIC_LIBRARY)
endif
diff --git a/opcontrol/Android.mk b/opcontrol/Android.mk
index bf6ec53..4f41f35 100644
--- a/opcontrol/Android.mk
+++ b/opcontrol/Android.mk
@@ -26,7 +26,11 @@
opcontrol.cpp
LOCAL_STATIC_LIBRARIES := \
- libpopt libutil libdb libabi libop
+ liboprofile_popt \
+ liboprofile_util \
+ liboprofile_db \
+ liboprofile_abi \
+ liboprofile_op
LOCAL_C_INCLUDES := $(common_target_c_includes)
LOCAL_CFLAGS := $(common_target_cflags)
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