diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2014-12-02 14:00:13 -0800 |
|---|---|---|
| committer | Dmitriy Ivanov <dimitry@google.com> | 2014-12-02 15:15:34 -0800 |
| commit | 06b1b8ceac992b861cc8a4fe21a3f8d5a40bb99c (patch) | |
| tree | 9c26126b1f5bccd33069d57a48d88c58014edaca /benchmarks | |
| parent | 5cd127d3aa4a2f225be202af01581838fdd3c721 (diff) | |
| download | bionic-06b1b8ceac992b861cc8a4fe21a3f8d5a40bb99c.zip bionic-06b1b8ceac992b861cc8a4fe21a3f8d5a40bb99c.tar.gz bionic-06b1b8ceac992b861cc8a4fe21a3f8d5a40bb99c.tar.bz2 | |
Extract bionic-prepare-run-on-host to inc file.
Make benchmark run-on-host depend on bionic-prepare-run-on-host.
Change-Id: I0bdbf561b2580d607a49b7c83cc273320ac55429
Diffstat (limited to 'benchmarks')
| -rw-r--r-- | benchmarks/Android.mk | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/benchmarks/Android.mk b/benchmarks/Android.mk index f163463..5ce8542 100644 --- a/benchmarks/Android.mk +++ b/benchmarks/Android.mk @@ -73,26 +73,22 @@ LOCAL_CXX_STL := libc++ include $(BUILD_HOST_EXECUTABLE) ifeq ($(HOST_OS)-$(HOST_ARCH),$(filter $(HOST_OS)-$(HOST_ARCH),linux-x86 linux-x86_64)) -ifeq ($(TARGET_ARCH),x86) -LINKER = linker -NATIVE_SUFFIX=32 -else -LINKER = linker64 -NATIVE_SUFFIX=64 +include $(LOCAL_PATH)/../build/run-on-host.mk + +ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64)) +bionic-benchmarks-run-on-host32: bionic-benchmarks bionic-prepare-run-on-host + ANDROID_DATA=$(TARGET_OUT_DATA) \ + ANDROID_ROOT=$(TARGET_OUT) \ + $(TARGET_OUT_EXECUTABLES)/bionic-benchmarks32 $(BIONIC_BENCHMARKS_FLAGS) endif -bionic-benchmarks-run-on-host: bionic-benchmarks $(TARGET_OUT_EXECUTABLES)/$(LINKER) $(TARGET_OUT_EXECUTABLES)/sh - if [ ! -d /system ]; then \ - echo "Attempting to create /system"; \ - sudo mkdir -p -m 0777 /system; \ - fi - mkdir -p $(TARGET_OUT_DATA)/local/tmp - ln -fs `realpath $(TARGET_OUT)/bin` /system/ - ln -fs `realpath $(TARGET_OUT)/etc` /system/ +ifeq ($(TARGET_IS_64_BIT),true) +bionic-benchmarks-run-on-host64: bionic-benchmarks bionic-prepare-run-on-host ANDROID_DATA=$(TARGET_OUT_DATA) \ ANDROID_ROOT=$(TARGET_OUT) \ - LD_LIBRARY_PATH=$(TARGET_OUT_SHARED_LIBRARIES) \ - $(TARGET_OUT_EXECUTABLES)/bionic-benchmarks$(NATIVE_SUFFIX) $(BIONIC_BENCHMARKS_FLAGS) -endif # linux-x86 + $(TARGET_OUT_EXECUTABLES)/bionic-benchmarks64 $(BIONIC_BENCHMARKS_FLAGS) +endif + +endif endif # !BUILD_TINY_ANDROID |