ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* commit '570cd46d14645f622e9972671308fdb4f2425292':
  Revert "Move libutils to libc++"
This commit is contained in:
Dan Albert 2014-05-30 20:17:32 +00:00 • committed by Android Git Automerger
commit e8f90ca60d
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 libcutils
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libbacktrace_libc++ \ libbacktrace \
liblog \ liblog \
libdl libdl
include external/libcxx/libcxx.mk include external/stlport/libstlport.mk
LOCAL_MODULE:= libutils LOCAL_MODULE:= libutils
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
@ -123,12 +123,12 @@ include $(CLEAR_VARS)
LOCAL_MODULE:= libutils LOCAL_MODULE:= libutils
LOCAL_WHOLE_STATIC_LIBRARIES := libutils LOCAL_WHOLE_STATIC_LIBRARIES := libutils
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libbacktrace_libc++ \ libbacktrace \
libcutils \ libcutils \
libdl \ libdl \
liblog \ liblog \
include external/libcxx/libcxx.mk include external/stlport/libstlport.mk
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

5
libutils/tests/Android.mk
View file

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