simpleperf: build simpleperf instead of simpleperf32 on gce_x86.

Bug: http://b/77219275
Test: build manually.
Change-Id: I9082fee3b31b7eb8e90096262c11d1875cbf4e64
(cherry picked from commit 170cb4963a73aa70e31667d94d8efcaabd89ba25)

diff --git a/simpleperf/Android.mk b/simpleperf/Android.mk
index 0126351..05a9471 100644 (file)
--- 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)