generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

resolved conflicts for merge of f4af9110 to klp-dev-plus-aosp

Browse Source 
Change-Id: I9e499e552b758392dd0c7b8d888944c0150dd22a
This commit is contained in:
Conley Owens 2013-09-27 09:42:15 -07:00
commit e83a780600
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/Android.mk
View File

@ -125,7 +125,7 @@ LOCAL_MODULE := bionic-unit-tests-static
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_FORCE_STATIC_EXECUTABLE := true
LOCAL_WHOLE_STATIC_LIBRARIES += libBionicTests
LOCAL_STATIC_LIBRARIES += libstlport_static libstdc++ libm libc
LOCAL_STATIC_LIBRARIES += libstlport_static libstdc++ libm libc bionic-unit-tests-unwind-test-impl
include $(BUILD_NATIVE_TEST)
# -----------------------------------------------------------------------------
@ -150,7 +150,6 @@ LOCAL_C_INCLUDES += \
LOCAL_WHOLE_STATIC_LIBRARIES := \
$(test_fortify_static_libraries) \
bionic-unit-tests-unwind-test-impl \
include $(BUILD_STATIC_LIBRARY)
# -----------------------------------------------------------------------------