generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am cd004d2d: am 2ed09d44: Merge "Fix build."

Browse Source 
* commit 'cd004d2d0117243908b71b2b4c7036d79de5344c':
  Fix build.
This commit is contained in:
Sreeram Ramachandran 2014-05-14 00:05:40 +00:00 committed by Android Git Automerger
commit 9d58ec78b3
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libc/Android.mk
View File

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