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

* commit '59112a2da30004b20c186e0878148cd6053ae859':
  Static binaries with libc++ need libs c, m and dl.
This commit is contained in:
Dan Albert
2015-03-20 03:14:17 +00:00
committed by Android Git Automerger

View File

@@ -53,6 +53,11 @@ ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),)
my_shared_libraries += libc++ my_shared_libraries += libc++
else else
my_static_libraries += libc++_static 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 endif
ifdef LOCAL_IS_HOST_MODULE ifdef LOCAL_IS_HOST_MODULE