commit ad3f2ee0dfbd8d63ffa81d4bb126c7d2cfaded2b
author Dan Albert <danalbert@google.com> Fri Mar 20 03:23:48 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 20 03:23:48 2015 +0000
tree 225c2900543c95f257405e5b4a3b6eb977535a06
parent 48fe5b7cadca3c945e81182411e9537cb11d81d3
parent f1999c8af022d295397d2c1079dbebf362d9ad37

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.

core/cxx_stl_setup.mk

diff --git a/core/cxx_stl_setup.mk b/core/cxx_stl_setup.mk
index 265d8cb..63e2069 100644
--- a/core/cxx_stl_setup.mk
+++ b/core/cxx_stl_setup.mk
@@ -53,6 +53,11 @@
         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