am f1999c8a: am 59112a2d: Merge "Static binaries with libc++ need libs c, m and dl."

* commit 'f1999c8af022d295397d2c1079dbebf362d9ad37':
  Static binaries with libc++ need libs c, m and dl.
This commit is contained in:
Dan Albert 2015-03-20 03:23:48 +00:00 committed by Android Git Automerger
commit ad3f2ee0df
1 changed files with 5 additions and 0 deletions

View File

@ -53,6 +53,11 @@ ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),)
my_shared_libraries += libc++
else
my_static_libraries += libc++_static
ifndef LOCAL_IS_HOST_MODULE
ifeq ($(LOCAL_FORCE_STATIC_EXECUTABLE),true)
my_static_libraries += libm libc libdl
endif
endif
endif
ifdef LOCAL_IS_HOST_MODULE