am 8db4b91b: am d2236e2c: Merge "Fix Mac build."

* commit '8db4b91bd2a069b2afb377f7e5190f625c3002cf':
  Fix Mac build.
This commit is contained in:
Elliott Hughes 2012-09-13 11:11:54 -07:00 committed by Android Git Automerger
commit bec648ee9f

View File

@ -51,6 +51,7 @@ include $(BUILD_NATIVE_TEST)
# Note that this will build against glibc, so it's not useful for testing
# bionic's implementation, but it does let you use glibc as a reference
# implementation for testing the tests themselves.
ifeq ($(HOST_OS)-$(HOST_ARCH),linux-x86)
include $(CLEAR_VARS)
LOCAL_MODULE := bionic-unit-tests-glibc
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
@ -58,5 +59,6 @@ LOCAL_LDFLAGS += -lpthread -ldl
LOCAL_LDFLAGS += $(test_dynamic_ldflags)
LOCAL_SRC_FILES := $(test_src_files) $(test_dynamic_src_files)
include $(BUILD_HOST_NATIVE_TEST)
endif
endif # !BUILD_TINY_ANDROID