diff options
| author | Yabin Cui <yabinc@google.com> | 2016-02-25 11:02:30 -0800 |
|---|---|---|
| committer | Yabin Cui <yabinc@google.com> | 2016-02-25 11:02:30 -0800 |
| commit | ff7465c896ab90c162cbcf2b141c4cdd79bf437f (patch) | |
| tree | 8cd8c3a5b0aff1e52d9c2b4de308ccb30df2e525 /simpleperf/Android.mk | |
| parent | e0908972807e5366aba6af130a53803333f94145 (diff) | |
| download | extras-ff7465c896ab90c162cbcf2b141c4cdd79bf437f.tar.gz | |
simpleperf: fix mac build.
I forgot that mac doesn't support whole static library. Change to static library
to avoid hiting the same problem in the future.
Bug: 26962895
Change-Id: Ia8e26c2e1cf7621391e00e100b22b7ed451dfa32
Diffstat (limited to 'simpleperf/Android.mk')
| -rw-r--r-- | simpleperf/Android.mk | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/simpleperf/Android.mk b/simpleperf/Android.mk index 7e2eae45..66f4768d 100644 --- a/simpleperf/Android.mk +++ b/simpleperf/Android.mk @@ -182,8 +182,7 @@ LOCAL_MODULE_TAGS := debug LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES) LOCAL_CPPFLAGS := $(simpleperf_cppflags_target) LOCAL_SRC_FILES := main.cpp -LOCAL_WHOLE_STATIC_LIBRARIES := libsimpleperf -LOCAL_STATIC_LIBRARIES := $(simpleperf_static_libraries_target) +LOCAL_STATIC_LIBRARIES := libsimpleperf $(simpleperf_static_libraries_target) LOCAL_SHARED_LIBRARIES := $(simpleperf_shared_libraries_target) LOCAL_MULTILIB := first include $(BUILD_EXECUTABLE) @@ -194,8 +193,7 @@ LOCAL_CLANG := true LOCAL_MODULE := simpleperf_static LOCAL_CPPFLAGS := $(simpleperf_cppflags_target) LOCAL_SRC_FILES := main.cpp -LOCAL_WHOLE_STATIC_LIBRARIES := libsimpleperf_static -LOCAL_STATIC_LIBRARIES := $(static_simpleperf_static_libraries_target) +LOCAL_STATIC_LIBRARIES := libsimpleperf_static $(static_simpleperf_static_libraries_target) LOCAL_MULTILIB := first LOCAL_FORCE_STATIC_EXECUTABLE := true include $(LLVM_DEVICE_BUILD_MK) @@ -210,8 +208,7 @@ LOCAL_CPPFLAGS_darwin := $(simpleperf_cppflags_host_darwin) LOCAL_CPPFLAGS_linux := $(simpleperf_cppflags_host_linux) LOCAL_CPPFLAGS_windows := $(simpleperf_cppflags_host_windows) LOCAL_SRC_FILES := main.cpp -LOCAL_WHOLE_STATIC_LIBRARIES := libsimpleperf -LOCAL_STATIC_LIBRARIES := $(simpleperf_static_libraries_host) +LOCAL_STATIC_LIBRARIES := libsimpleperf $(simpleperf_static_libraries_host) LOCAL_SHARED_LIBRARIES_darwin := $(simpleperf_shared_libraries_host_darwin) LOCAL_SHARED_LIBRARIES_linux := $(simpleperf_shared_libraries_host_linux) LOCAL_SHARED_LIBRARIES_windows := $(simpleperf_shared_libraries_host_windows) @@ -249,8 +246,7 @@ LOCAL_SRC_FILES := \ $(simpleperf_unit_test_src_files) \ $(simpleperf_unit_test_src_files_linux) \ -LOCAL_WHOLE_STATIC_LIBRARIES := libsimpleperf -LOCAL_STATIC_LIBRARIES += $(simpleperf_static_libraries_target) +LOCAL_STATIC_LIBRARIES += libsimpleperf $(simpleperf_static_libraries_target) LOCAL_SHARED_LIBRARIES := $(simpleperf_shared_libraries_target) LOCAL_MULTILIB := first include $(BUILD_NATIVE_TEST) @@ -265,8 +261,7 @@ LOCAL_CPPFLAGS_linux := $(simpleperf_cppflags_host_linux) LOCAL_CPPFLAGS_windows := $(simpleperf_cppflags_host_windows) LOCAL_SRC_FILES := $(simpleperf_unit_test_src_files) LOCAL_SRC_FILES_linux := $(simpleperf_unit_test_src_files_linux) -LOCAL_WHOLE_STATIC_LIBRARIES := libsimpleperf -LOCAL_STATIC_LIBRARIES := $(simpleperf_static_libraries_host) +LOCAL_STATIC_LIBRARIES := libsimpleperf $(simpleperf_static_libraries_host) LOCAL_SHARED_LIBRARIES_darwin := $(simpleperf_shared_libraries_host_darwin) LOCAL_SHARED_LIBRARIES_linux := $(simpleperf_shared_libraries_host_linux) LOCAL_SHARED_LIBRARIES_windows := $(simpleperf_shared_libraries_host_windows) @@ -286,9 +281,8 @@ LOCAL_CLANG := true LOCAL_MODULE := simpleperf_cpu_hotplug_test LOCAL_CPPFLAGS := $(simpleperf_cppflags_target) LOCAL_SRC_FILES := $(simpleperf_cpu_hotplug_test_src_files) -LOCAL_WHOLE_STATIC_LIBRARIES := libsimpleperf +LOCAL_STATIC_LIBRARIES := libsimpleperf $(simpleperf_static_libraries_target) LOCAL_SHARED_LIBRARIES := $(simpleperf_shared_libraries_target) -LOCAL_STATIC_LIBRARIES := $(simpleperf_static_libraries_target) LOCAL_MULTILIB := first include $(BUILD_NATIVE_TEST) @@ -300,8 +294,7 @@ LOCAL_MODULE_HOST_OS := linux LOCAL_CPPFLAGS := $(simpleperf_cppflags_host) LOCAL_CPPFLAGS_linux := $(simpleperf_cppflags_host_linux) LOCAL_SRC_FILES := $(simpleperf_cpu_hotplug_test_src_files) -LOCAL_WHOLE_STATIC_LIBRARIES := libsimpleperf -LOCAL_STATIC_LIBRARIES := $(simpleperf_static_libraries_host) +LOCAL_STATIC_LIBRARIES := libsimpleperf $(simpleperf_static_libraries_host) LOCAL_SHARED_LIBRARIES_linux := $(simpleperf_shared_libraries_host_linux) LOCAL_LDLIBS_linux := $(simpleperf_ldlibs_host_linux) LOCAL_MULTILIB := first |