diff options
| author | Keun-young Park <keunyoung@google.com> | 2013-03-26 22:47:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-03-26 22:47:34 +0000 |
| commit | 4886329fd53290061515485e7cf3ce497fc1b5b9 (patch) | |
| tree | 79508df9b15cf7ebf0a9aea8c1d4eb7b6e44a680 | |
| parent | dfc755a789a02c9b990e111bd0cb9a75d3a5e8e6 (diff) | |
| parent | 935b17dd32d856eff6cdacecaee0b66cd00af69d (diff) | |
| download | oprofile-4886329fd53290061515485e7cf3ce497fc1b5b9.tar.gz | |
Merge "Add oprofile host tool support for mips."android-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4_r0.7android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1android-4.3_r3.1android-4.3_r3android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-4.3.1_r1tools_r22.2tools_r22kitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-devjb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-devjb-mr1.1-dev-plus-aosp
| -rw-r--r-- | common.mk | 9 | ||||
| -rw-r--r-- | pp/Android.mk | 2 | ||||
| -rw-r--r-- | pp/opannotate.cpp | 4 |
3 files changed, 13 insertions, 2 deletions
@@ -36,6 +36,15 @@ HAVE_LIBBFD := false ifeq ($(TARGET_ARCH),arm) toolchain := prebuilts/gcc/$(HOST_PREBUILT_TAG)/arm/arm-linux-androideabi-4.6 +common_host_extra_flags := -DANDROID_TARGET_ARM +endif + +ifeq ($(TARGET_ARCH),mips) +toolchain := prebuilts/gcc/$(HOST_PREBUILT_TAG)/mips/mipsel-linux-android-4.6 +common_host_extra_flags := -DANDROID_TARGET_MIPS +endif + +ifneq ($(filter arm mips,$(TARGET_ARCH)),) common_host_c_includes := $(common_c_includes) $(toolchain)/include common_host_cflags := $(common_cflags) -fexceptions -DANDROID_HOST -DHAVE_XCALLOC common_host_ldlibs_libiconv := diff --git a/pp/Android.mk b/pp/Android.mk index fa1cf6e..36f2b03 100644 --- a/pp/Android.mk +++ b/pp/Android.mk @@ -62,7 +62,7 @@ LOCAL_SRC_FILES:= \ LOCAL_STATIC_LIBRARIES := $(common_libs) LOCAL_C_INCLUDES := $(common_host_c_includes) -LOCAL_CFLAGS := $(common_host_cflags) +LOCAL_CFLAGS := $(common_host_cflags) $(common_host_extra_flags) LOCAL_LDLIBS := $(common_ldlibs) LOCAL_MODULE_TAGS := optional LOCAL_MODULE:= opannotate diff --git a/pp/opannotate.cpp b/pp/opannotate.cpp index 8df841b..ddfd8b4 100644 --- a/pp/opannotate.cpp +++ b/pp/opannotate.cpp @@ -417,8 +417,10 @@ void do_one_output_objdump(symbol_collection const & symbols, } args.push_back(image_name); -#if defined(ANDROID) +#if defined(ANDROID_TARGET_ARM) child_reader reader("arm-eabi-objdump", args); +#elif defined(ANDROID_TARGET_MIPS) + child_reader reader("mipsel-linux-android-objdump", args); #else child_reader reader("objdump", args); #endif |