diff options
| author | Yabin Cui <yabinc@google.com> | 2017-01-04 21:27:26 +0000 |
|---|---|---|
| committer | Yabin Cui <yabinc@google.com> | 2017-01-04 13:34:30 -0800 |
| commit | 57222a30356b485a9ad5fefdef4c3f63dbb7ce2e (patch) | |
| tree | 86b1184956aba5e9036ed15b893a7309f6fbaf11 /simpleperf | |
| parent | b4cdbd535cb947a67d316742f8144c1d4ec93358 (diff) | |
| download | extras-57222a30356b485a9ad5fefdef4c3f63dbb7ce2e.tar.gz | |
Revert "Revert "simpleperf: add binaries in sdk build.""
This reverts commit 266cf44be350c02766e9fe988185caeb224d0769.
And fix error in the original patch.
Bug: http://b/32834638
Test: make x86-sdk and mips-sdk.
Change-Id: Ie9bc21ca461252f54c8f443747c8d9d1b5d33c02
Diffstat (limited to 'simpleperf')
| -rw-r--r-- | simpleperf/Android.mk | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/simpleperf/Android.mk b/simpleperf/Android.mk index e9939066..7beb1342 100644 --- a/simpleperf/Android.mk +++ b/simpleperf/Android.mk @@ -190,7 +190,7 @@ endif # simpleperf host include $(CLEAR_VARS) -LOCAL_MODULE := simpleperf +LOCAL_MODULE := simpleperf_host LOCAL_MODULE_HOST_OS := darwin linux windows LOCAL_CPPFLAGS := $(simpleperf_cppflags_host) LOCAL_CPPFLAGS_darwin := $(simpleperf_cppflags_host_darwin) @@ -200,13 +200,22 @@ LOCAL_SRC_FILES := main.cpp LOCAL_STATIC_LIBRARIES := libsimpleperf $(simpleperf_static_libraries_host) LOCAL_STATIC_LIBRARIES_linux := $(simpleperf_static_libraries_host_linux) LOCAL_LDLIBS_linux := $(simpleperf_ldlibs_host_linux) -LOCAL_MULTILIB := first +LOCAL_MULTILIB := both +LOCAL_MODULE_STEM_32 := simpleperf32 +LOCAL_MODULE_STEM_64 := simpleperf LOCAL_CXX_STL := libc++_static include $(LLVM_HOST_BUILD_MK) include $(BUILD_HOST_EXECUTABLE) -$(call dist-for-goals,sdk,$(LOCAL_BUILT_MODULE):simpleperf_host) -$(call dist-for-goals,win_sdk,$(ALL_MODULES.host_cross_simpleperf.BUILT)) +$(call dist-for-goals,sdk,$(ALL_MODULES.simpleperf_host.BUILT):simpleperf_host) +ifdef HOST_2ND_ARCH +$(call dist-for-goals,sdk,$(ALL_MODULES.simpleperf_host$(HOST_2ND_ARCH_MODULE_SUFFIX).BUILT):simpleperf_host32) +endif +$(call dist-for-goals,win_sdk,$(ALL_MODULES.host_cross_simpleperf_host.BUILT)) +ifdef HOST_CROSS_2ND_ARCH +$(call dist-for-goals,win_sdk,$(ALL_MODULES.host_cross_simpleperf_host$(HOST_CROSS_2ND_ARCH_MODULE_SUFFIX).BUILT)) +endif + # simpleperf report script include $(CLEAR_VARS) @@ -237,6 +246,14 @@ LOCAL_CXX_STL := libc++_static include $(LLVM_HOST_BUILD_MK) include $(BUILD_HOST_SHARED_LIBRARY) +$(call dist-for-goals,sdk,$(ALL_MODULES.libsimpleperf_report.BUILT)) +ifdef HOST_2ND_ARCH +$(call dist-for-goals,sdk,$(ALL_MODULES.libsimpleperf_report$(HOST_2ND_ARCH_MODULE_SUFFIX).BUILT):libsimpleperf_report32.so) +endif +$(call dist-for-goals,win_sdk,$(ALL_MODULES.host_cross_libsimpleperf_report.BUILT):libsimpleperf_report32.dll) +ifdef HOST_CROSS_2ND_ARCH +$(call dist-for-goals,win_sdk,$(ALL_MODULES.host_cross_libsimpleperf_report$(HOST_CROSS_2ND_ARCH_MODULE_SUFFIX).BUILT)) +endif # simpleperf_unit_test # ========================================================= @@ -297,7 +314,7 @@ LOCAL_SRC_FILES_linux := $(simpleperf_unit_test_src_files_linux) LOCAL_STATIC_LIBRARIES := libsimpleperf $(simpleperf_static_libraries_host) LOCAL_STATIC_LIBRARIES_linux := $(simpleperf_static_libraries_host_linux) LOCAL_LDLIBS_linux := $(simpleperf_ldlibs_host_linux) -LOCAL_MULTILIB := first +LOCAL_MULTILIB := both include $(LLVM_HOST_BUILD_MK) include $(BUILD_HOST_NATIVE_TEST) |