am 2443358b: am 4a509d89: Merge "Add bionic-unit-tests-run-on-host special target"

* commit '2443358b3717bdce932303bbcbe625f59e1ae380':
  Add bionic-unit-tests-run-on-host special target
This commit is contained in:
Elliott Hughes 2013-09-18 19:20:31 -07:00 committed by Android Git Automerger
commit ca0f0662f4

View File

@ -187,6 +187,27 @@ LOCAL_STATIC_LIBRARIES += bionic-unit-tests-unwind-test-impl-host
include $(BUILD_HOST_NATIVE_TEST) include $(BUILD_HOST_NATIVE_TEST)
endif endif
# -----------------------------------------------------------------------------
# Run the unit tests built against x86 bionic on an x86 host.
# -----------------------------------------------------------------------------
ifeq ($(HOST_OS)-$(HOST_ARCH),linux-x86)
ifeq ($(TARGET_ARCH),x86)
# gtest needs EXTERNAL_STORAGE for death test output.
# bionic itself should always work relative to ANDROID_DATA or ANDROID_ROOT.
# We create /data/local/tmp to be as much like the regular target environment
# as possible.
bionic-unit-tests-run-on-host: bionic-unit-tests $(TARGET_OUT_EXECUTABLES)/linker
mkdir -p $(TARGET_OUT_DATA)/local/tmp
cp $(TARGET_OUT_EXECUTABLES)/linker /system/bin
ANDROID_DATA=$(TARGET_OUT_DATA) \
ANDROID_ROOT=$(TARGET_OUT) \
EXTERNAL_STORAGE=$(TARGET_OUT_DATA)/local/tmp \
LD_LIBRARY_PATH=$(TARGET_OUT_SHARED_LIBRARIES) \
$(TARGET_OUT_DATA_NATIVE_TESTS)/bionic-unit-tests/bionic-unit-tests
endif
endif
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# FORTIFY_SOURCE tests # FORTIFY_SOURCE tests
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------