Merge "Renamed the misleading libc/netbsd directory to libc/dns."
authorCalin Juravle <calin@google.com>
Tue, 4 Mar 2014 14:25:30 +0000 (14:25 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 4 Mar 2014 14:25:30 +0000 (14:25 +0000)
1  2 
libc/Android.mk

diff --combined libc/Android.mk
index ea020548bc49a5f587b59fefbb7d9511572ba281,f3a2ce8b883793747b71d018baa0bd83e95d135f..25de501f549e1b9d6cfd147ed502bbef30830c8e
@@@ -104,6 -104,7 +104,6 @@@ libc_common_src_files := 
      stdlib/putenv.c \
      stdlib/setenv.c \
      stdlib/strtod.c \
 -    unistd/alarm.c \
      unistd/syslog.c \
      unistd/time.c \
  
@@@ -315,14 -316,11 +315,14 @@@ libc_upstream_netbsd_src_files := 
      upstream-netbsd/lib/libc/unistd/killpg.c \
  
  libc_upstream_openbsd_src_files := \
 +    upstream-openbsd/lib/libc/gen/alarm.c \
      upstream-openbsd/lib/libc/gen/exec.c \
 -    upstream-openbsd/lib/libc/gen/ftok.c \
      upstream-openbsd/lib/libc/gen/fnmatch.c \
 -    upstream-openbsd/lib/libc/gen/toupper_.c \
 +    upstream-openbsd/lib/libc/gen/ftok.c \
 +    upstream-openbsd/lib/libc/gen/getprogname.c \
 +    upstream-openbsd/lib/libc/gen/setprogname.c \
      upstream-openbsd/lib/libc/gen/tolower_.c \
 +    upstream-openbsd/lib/libc/gen/toupper_.c \
      upstream-openbsd/lib/libc/string/strstr.c \
      upstream-openbsd/lib/libc/string/strsep.c \
      upstream-openbsd/lib/libc/string/wcslcpy.c \
@@@ -467,6 -465,9 +467,6 @@@ include $(CLEAR_VARS
  
  LOCAL_SRC_FILES := bionic/__stack_chk_fail.cpp
  LOCAL_CFLAGS := $(libc_common_cflags) -fno-stack-protector -Werror
 -ifeq ($(TARGET_USES_LOGD),yes)
 -LOCAL_CFLAGS += -DTARGET_USES_LOGD
 -endif
  LOCAL_CONLYFLAGS := $(libc_common_conlyflags)
  LOCAL_CPPFLAGS := $(libc_common_cppflags)
  LOCAL_C_INCLUDES := $(libc_common_c_includes)
@@@ -508,7 -509,7 +508,7 @@@ include $(BUILD_STATIC_LIBRARY
  
  include $(CLEAR_VARS)
  
- LOCAL_SRC_FILES := $(call all-c-files-under,netbsd)
+ LOCAL_SRC_FILES := $(call all-c-files-under,dns)
  LOCAL_CFLAGS := \
      $(libc_common_cflags) \
      -DINET6 \
@@@ -623,10 -624,6 +623,10 @@@ LOCAL_SYSTEM_SHARED_LIBRARIES :
  # Since this code is experimental it is disabled by default.
  LOCAL_CFLAGS += -DPTHREAD_DEBUG_ENABLED=false
  
 +ifeq ($(TARGET_USES_LOGD),true)
 +LOCAL_CFLAGS += -DTARGET_USES_LOGD
 +endif
 +
  $(eval $(call patch-up-arch-specific-flags,LOCAL_CFLAGS,libc_common_cflags))
  $(eval $(call patch-up-arch-specific-flags,LOCAL_SRC_FILES,libc_bionic_src_files))
  include $(BUILD_STATIC_LIBRARY)