summaryrefslogtreecommitdiff
path: root/simpleperf/Android.mk
diff options
context:
space:
mode:
authorDaniel Friederich <dfriederich@magicleap.com>2016-10-17 12:28:03 -0500
committerDaniel Friederich <dfriederich@magicleap.com>2016-11-16 10:53:25 -0600
commitb2465ad8bae68531dd9dbed88be469612cd7229a (patch)
tree058302152fb8beb4a5a8a3532c057b69b5608433 /simpleperf/Android.mk
parent0e48e18171e17c76834916c2c87360195edf8667 (diff)
downloadextras-b2465ad8bae68531dd9dbed88be469612cd7229a.tar.gz
Support to use kallsyms
Also: - Adapt to use with Python 3 (where str is a wide type but our C API's expect 8 bit character strings) - Use OS specific so names (e.g. simpleperf_report.dll on Windows) - On Windows as we use mingw to build, preload libwinpthread-1.dll. Test: with manual incovation using report_sample.py Change-Id: Id973c463608c520b8eec229026c74dc5e8144cf8
Diffstat (limited to 'simpleperf/Android.mk')
-rw-r--r--simpleperf/Android.mk5
1 files changed, 2 insertions, 3 deletions
diff --git a/simpleperf/Android.mk b/simpleperf/Android.mk
index 3c402921..314a6067 100644
--- a/simpleperf/Android.mk
+++ b/simpleperf/Android.mk
@@ -13,7 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-
LOCAL_PATH := $(call my-dir)
simpleperf_version := $(shell git -C $(LOCAL_PATH) rev-parse --short=12 HEAD 2>/dev/null)
@@ -154,7 +153,7 @@ LOCAL_SRC_FILES_windows := $(libsimpleperf_src_files_windows)
LOCAL_STATIC_LIBRARIES := $(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_PROTOC_OPTIMIZE_TYPE := lite-static
LOCAL_CXX_STL := libc++_static
include $(LLVM_HOST_BUILD_MK)
@@ -231,7 +230,7 @@ LOCAL_SRC_FILES := report_lib_interface.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) -Wl,--exclude-libs,ALL
-LOCAL_MULTILIB := first
+LOCAL_MULTILIB := both
LOCAL_CXX_STL := libc++_static
include $(LLVM_HOST_BUILD_MK)
include $(BUILD_HOST_SHARED_LIBRARY)