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

am e8f90ca6: am 570cd46d: Merge "Revert "Move libutils to libc++""

Browse source 
* commit 'e8f90ca60d65f5a0542b77f8f517c4fb80da2e52':
  Revert "Move libutils to libc++"
This commit is contained in:
Dan Albert 2014-05-30 20:21:03 +00:00 committed by Android Git Automerger
commit 4b126c4604
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libutils/Android.mk
View file

@ -108,11 +108,11 @@ LOCAL_STATIC_LIBRARIES := \
libcutils
LOCAL_SHARED_LIBRARIES := \
libbacktrace_libc++ \
libbacktrace \
liblog \
libdl
include external/libcxx/libcxx.mk
include external/stlport/libstlport.mk
LOCAL_MODULE:= libutils
include $(BUILD_STATIC_LIBRARY)
@ -123,12 +123,12 @@ include $(CLEAR_VARS)
LOCAL_MODULE:= libutils
LOCAL_WHOLE_STATIC_LIBRARIES := libutils
LOCAL_SHARED_LIBRARIES := \
libbacktrace_libc++ \
libbacktrace \
libcutils \
libdl \
liblog \
include external/libcxx/libcxx.mk
include external/stlport/libstlport.mk
include $(BUILD_SHARED_LIBRARY)

5
libutils/tests/Android.mk
View file

@ -18,6 +18,11 @@ shared_libraries := \
liblog \
libcutils \
libutils \
libstlport
static_libraries := \
libgtest \
libgtest_main
$(foreach file,$(test_src_files), \
$(eval include $(CLEAR_VARS)) \