diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-15 07:10:08 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-15 07:10:08 +0000 |
| commit | c6cdd000093508ad0ef70b1dddf84fa6683d3716 (patch) | |
| tree | 7f1c1739d94e8b136a9f1f036cc5015b4b5e449e | |
| parent | f35061362c6ad6a3256e051ca4b940681991bab5 (diff) | |
| parent | f608ab242d9b37e4b4c087314806071202d71f41 (diff) | |
| download | linux-tools-perf-c6cdd000093508ad0ef70b1dddf84fa6683d3716.tar.gz | |
am f608ab24: Merge "These bugs only affect arm32, so allow clang."
* commit 'f608ab242d9b37e4b4c087314806071202d71f41':
These bugs only affect arm32, so allow clang.
| -rw-r--r-- | perf-3.12.0/tools/perf/Android.mk | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/perf-3.12.0/tools/perf/Android.mk b/perf-3.12.0/tools/perf/Android.mk index ebb1a19..400e548 100644 --- a/perf-3.12.0/tools/perf/Android.mk +++ b/perf-3.12.0/tools/perf/Android.mk @@ -200,9 +200,6 @@ include $(BUILD_STATIC_LIBRARY) # host libperf # include $(CLEAR_VARS) -# builtin-report.c and builtin-top.c have undefined __aeabi_read_tp -# when compiled with clang -fpie. -LOCAL_CLANG := false LOCAL_SRC_FILES := $(libperf_src_files) @@ -216,8 +213,6 @@ LOCAL_MODULE := libperf LOCAL_MODULE_TAGS := eng LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk -LOCAL_CLANG := false - include $(BUILD_HOST_STATIC_LIBRARY) # @@ -315,9 +310,6 @@ include $(BUILD_EXECUTABLE) # host perf # include $(CLEAR_VARS) -# builtin-report.c and builtin-top.c have undefined __aeabi_read_tp -# when compiled with clang -fpie. -LOCAL_CLANG := false LOCAL_SRC_FILES := $(perf_src_files) LOCAL_SRC_FILES_x86 := $(perf_src_files_x86) @@ -349,8 +341,6 @@ LOCAL_MODULE := perfhost LOCAL_MODULE_TAGS := eng LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk -LOCAL_CLANG := false - include $(BUILD_HOST_EXECUTABLE) endif #cur_platform |