tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am 015b89cc: am 955ebbaa: Merge "Cleanup libc++ configuration."

Browse source 
* commit '015b89cce2497f4157ac0322ebc4a604178a304a':
  Cleanup libc++ configuration.
This commit is contained in:
Dan Albert 2015-05-07 15:58:12 +00:00 committed by Android Git Automerger
commit 194f2de5f5
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/cxx_stl_setup.mk
View file

@ -49,15 +49,11 @@ endif
ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),)
my_cflags += -D_USING_LIBCXX
my_c_includes += external/libcxx/include
ifeq ($(my_cxx_stl),libc++)
ifeq ($(my_link_type),dynamic)
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
@ -71,7 +67,7 @@ ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),)
endif
ifeq ($(my_link_type),static)
my_static_libraries += libdl
my_static_libraries += libm libc libdl
else
my_shared_libraries += libdl
endif