am 2ed09d44: Merge "Fix build."

* commit '2ed09d44ecdaf656a598052d155a813897239042':
  Fix build.
This commit is contained in:
Sreeram Ramachandran 2014-05-14 00:00:58 +00:00 committed by Android Git Automerger
commit cd004d2d01

View File

@ -142,7 +142,6 @@ libc_bionic_src_files := \
bionic/mkfifo.cpp \
bionic/mknod.cpp \
bionic/mntent.cpp \
bionic/NetdClient.cpp \
bionic/open.cpp \
bionic/pause.cpp \
bionic/pipe.cpp \
@ -848,6 +847,7 @@ LOCAL_SRC_FILES := \
bionic/dlmalloc.c \
bionic/malloc_debug_common.cpp \
bionic/libc_init_static.cpp \
bionic/NetdClient.cpp \
LOCAL_CFLAGS := $(libc_common_cflags) \
-DLIBC_STATIC
@ -883,6 +883,7 @@ LOCAL_SRC_FILES := \
bionic/debug_stacktrace.cpp \
bionic/pthread_debug.cpp \
bionic/libc_init_dynamic.cpp \
bionic/NetdClient.cpp \
LOCAL_MODULE := libc
LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies)