Skip to content
This repository has been archived by the owner on Aug 3, 2022. It is now read-only.

Commit

Permalink
Reenable oprofile host build.
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
Jeff Brown committed Apr 8, 2011
1 parent f06448b commit 6e67eb0
Show file tree
Hide file tree
Showing 13 changed files with 59 additions and 55 deletions.
21 changes: 11 additions & 10 deletions common.mk
View file
Expand Up @@ -32,21 +32,22 @@ common_target_c_includes := $(common_c_includes)
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
7 changes: 6 additions & 1 deletion daemon/Android.mk
View file
Expand Up @@ -36,7 +36,12 @@ LOCAL_SRC_FILES:= \
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)
Expand Down
16 changes: 10 additions & 6 deletions libabi/Android.mk
View file
Expand Up @@ -25,7 +25,7 @@ LOCAL_SRC_FILES:= $(libabi_common_src)
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)

Expand All @@ -39,9 +39,8 @@ LOCAL_SRC_FILES:= \

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
Expand All @@ -53,9 +52,14 @@ include $(CLEAR_VARS)
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

Expand Down
5 changes: 2 additions & 3 deletions libdb/Android.mk
View file
Expand Up @@ -29,7 +29,7 @@ LOCAL_SRC_FILES:= $(common_src)
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)

Expand All @@ -40,10 +40,9 @@ 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 := libdb
LOCAL_MODULE := liboprofile_db

include $(BUILD_HOST_STATIC_LIBRARY)
endif
5 changes: 2 additions & 3 deletions libop/Android.mk
View file
Expand Up @@ -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)

Expand All @@ -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
3 changes: 1 addition & 2 deletions libopt++/Android.mk
View file
Expand Up @@ -22,9 +22,8 @@ include $(CLEAR_VARS)
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
5 changes: 2 additions & 3 deletions libpopt/Android.mk
View file
Expand Up @@ -29,7 +29,7 @@ LOCAL_SRC_FILES:= $(common_src)
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)

Expand All @@ -40,9 +40,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 := libpopt
LOCAL_MODULE := liboprofile_popt

include $(BUILD_HOST_STATIC_LIBRARY)
endif
5 changes: 2 additions & 3 deletions libpp/Android.mk
View file
Expand Up @@ -44,9 +44,8 @@ LOCAL_SRC_FILES:= \

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
endif
3 changes: 1 addition & 2 deletions libregex/Android.mk
View file
Expand Up @@ -26,9 +26,8 @@ LOCAL_SRC_FILES:= \

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
5 changes: 2 additions & 3 deletions libutil++/Android.mk
View file
Expand Up @@ -37,9 +37,8 @@ LOCAL_SRC_FILES:= \

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
endif
5 changes: 2 additions & 3 deletions libutil/Android.mk
View file
Expand Up @@ -35,7 +35,7 @@ LOCAL_SRC_FILES:= $(common_src)
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)

Expand All @@ -46,9 +46,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 := libutil
LOCAL_MODULE := liboprofile_util

include $(BUILD_HOST_STATIC_LIBRARY)
endif
6 changes: 5 additions & 1 deletion opcontrol/Android.mk
View file
Expand Up @@ -26,7 +26,11 @@ LOCAL_SRC_FILES:= \
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)
Expand Down
28 changes: 13 additions & 15 deletions pp/Android.mk
View file
Expand Up @@ -19,17 +19,19 @@ include $(LOCAL_PATH)/../common.mk
common_src := common_option.cpp

common_libs := \
libpp \
libop \
libutil \
libdb \
libop_regex \
libopt++ \
libutil++ \
libpopt \
libz

common_ldlibs := -lbfd -liberty -lintl -liconv
liboprofile_pp \
liboprofile_db \
liboprofile_op_regex \
liboprofile_opt++ \
liboprofile_util++ \
liboprofile_popt \
liboprofile_op \
liboprofile_util \
libbfd \
libiberty \
libintl

common_ldlibs := -lz $(common_host_ldlibs_libiconv)

ifeq ($(HAVE_LIBBFD),true)

Expand All @@ -44,7 +46,6 @@ LOCAL_SRC_FILES:= \
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
Expand All @@ -62,7 +63,6 @@ LOCAL_SRC_FILES:= \
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
Expand All @@ -80,7 +80,6 @@ LOCAL_SRC_FILES:= \
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
Expand All @@ -98,7 +97,6 @@ LOCAL_SRC_FILES:= \
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
Expand Down

0 comments on commit 6e67eb0

Please sign in to comment.