diff options
| author | Yabin Cui <yabinc@google.com> | 2018-03-28 12:50:15 -0700 |
|---|---|---|
| committer | Yabin Cui <yabinc@google.com> | 2018-03-28 17:46:15 -0700 |
| commit | d56352cb1a7d152b7d76849d0edba71baea676d0 (patch) | |
| tree | 8a0e3d6e8e2eccc135efa4449fa84d5f57e2f9a4 | |
| parent | 2a7b571d3216c83d025e47d6553be25a9159dd27 (diff) | |
| download | extras-d56352cb1a7d152b7d76849d0edba71baea676d0.tar.gz | |
simpleperf: build simpleperf instead of simpleperf32 on gce_x86.
Bug: http://b/77219275
Test: build manually.
Change-Id: I9082fee3b31b7eb8e90096262c11d1875cbf4e64
(cherry picked from commit 170cb4963a73aa70e31667d94d8efcaabd89ba25)
| -rw-r--r-- | simpleperf/Android.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/simpleperf/Android.mk b/simpleperf/Android.mk index 01263516..05a94717 100644 --- a/simpleperf/Android.mk +++ b/simpleperf/Android.mk @@ -178,10 +178,12 @@ LOCAL_CFLAGS := $(simpleperf_cflags_target) LOCAL_SRC_FILES := main.cpp LOCAL_STATIC_LIBRARIES := libsimpleperf $(simpleperf_static_libraries_with_libc_target) ifdef TARGET_2ND_ARCH +ifneq ($(TARGET_TRANSLATE_2ND_ARCH),true) LOCAL_MULTILIB := both LOCAL_MODULE_STEM_32 := simpleperf32 LOCAL_MODULE_STEM_64 := simpleperf endif +endif LOCAL_FORCE_STATIC_EXECUTABLE := true include $(LLVM_DEVICE_BUILD_MK) include $(BUILD_EXECUTABLE) |