diff options
| -rw-r--r-- | linker/Android.mk | 3 | ||||
| -rw-r--r-- | tests/Android.mk | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/linker/Android.mk b/linker/Android.mk index cc7fadf..54535fc 100644 --- a/linker/Android.mk +++ b/linker/Android.mk @@ -19,6 +19,9 @@ LOCAL_SRC_FILES_x86_64 := arch/x86_64/begin.S LOCAL_SRC_FILES_mips := arch/mips/begin.S linker_mips.cpp LOCAL_SRC_FILES_mips64 := arch/mips64/begin.S linker_mips.cpp +# -shared is used to overwrite the -Bstatic and -static +# flags triggered by LOCAL_FORCE_STATIC_EXECUTABLE. +# This dynamic linker is actually a shared object linked with static libraries. LOCAL_LDFLAGS := \ -shared \ -Wl,-Bsymbolic \ diff --git a/tests/Android.mk b/tests/Android.mk index 11fb2c8..87c330b 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -413,11 +413,15 @@ bionic-unit-tests-glibc-run: bionic-unit-tests-glibc include $(LOCAL_PATH)/../build/run-on-host.mk ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64)) + +TEST_TIMEOUT := 0 + # BIONIC_TEST_FLAGS is either empty or it comes from the user. bionic-unit-tests-run-on-host32: bionic-unit-tests bionic-prepare-run-on-host ANDROID_DATA=$(TARGET_OUT_DATA) \ ANDROID_DNS_MODE=local \ ANDROID_ROOT=$(TARGET_OUT) \ + timeout $(TEST_TIMEOUT) \ $(TARGET_OUT_DATA)/nativetest/bionic-unit-tests/bionic-unit-tests32 $(BIONIC_TEST_FLAGS) ifeq ($(TARGET_IS_64_BIT),true) @@ -426,6 +430,7 @@ bionic-unit-tests-run-on-host64: bionic-unit-tests bionic-prepare-run-on-host ANDROID_DATA=$(TARGET_OUT_DATA) \ ANDROID_DNS_MODE=local \ ANDROID_ROOT=$(TARGET_OUT) \ + timeout $(TEST_TIMEOUT) \ $(TARGET_OUT_DATA)/nativetest64/bionic-unit-tests/bionic-unit-tests64 $(BIONIC_TEST_FLAGS) endif |