| author | Koushik Dutta <koushd@gmail.com> | 2011-11-17 00:54:19 (GMT) |
|---|---|---|
| committer | Koushik Dutta <koushd@gmail.com> | 2011-11-17 00:54:19 (GMT) |
| commit | 153ca5ab1636e38fe875ea87876dc532a566cc0c (patch) | |
| tree | 9ffaa813374ef161244b855863395ef2da7daefa | |
| parent | 29d8ebe3459c19759de19df0d6cadcbfc419946a (diff) | |
| download | busybox-153ca5ab1636e38fe875ea87876dc532a566cc0c.zip busybox-153ca5ab1636e38fe875ea87876dc532a566cc0c.tar.gz busybox-153ca5ab1636e38fe875ea87876dc532a566cc0c.tar.bz2 | |
fixes for ics
| -rw-r--r-- | Android.mk | 26 | ||||
| -rw-r--r-- | libbb/udp_io.c | 7 |
2 files changed, 13 insertions, 20 deletions
@@ -1,15 +1,15 @@ LOCAL_PATH := $(call my-dir) - -# Make a static library for clearsilver's regex. -# This prevents multiple symbol definition error.... -include $(CLEAR_VARS) -LOCAL_SRC_FILES := ../clearsilver/util/regex/regex.c -LOCAL_MODULE := libclearsilverregex -LOCAL_C_INCLUDES := \ - external/clearsilver \ - external/clearsilver/util/regex -include $(BUILD_STATIC_LIBRARY) +# +# # Make a static library for clearsilver's regex. +# # This prevents multiple symbol definition error.... +# include $(CLEAR_VARS) +# LOCAL_SRC_FILES := ../clearsilver/util/regex/regex.c +# LOCAL_MODULE := libclearsilverregex +# LOCAL_C_INCLUDES := \ +# external/clearsilver \ +# external/clearsilver/util/regex +# include $(BUILD_STATIC_LIBRARY) @@ -101,7 +101,7 @@ LOCAL_CFLAGS += \ -Dgenerate_uuid=busybox_generate_uuid LOCAL_MODULE := libbusybox LOCAL_MODULE_TAGS := eng -LOCAL_STATIC_LIBRARIES := libclearsilverregex libcutils libc libm +LOCAL_STATIC_LIBRARIES := libcutils libc libm $(LOCAL_MODULE): busybox_prepare include $(BUILD_STATIC_LIBRARY) @@ -117,7 +117,7 @@ LOCAL_CFLAGS := $(BUSYBOX_CFLAGS) LOCAL_MODULE := busybox LOCAL_MODULE_TAGS := eng LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES) -LOCAL_STATIC_LIBRARIES := libclearsilverregex +# LOCAL_STATIC_LIBRARIES := libclearsilverregex $(LOCAL_MODULE): busybox_prepare include $(BUILD_EXECUTABLE) @@ -159,7 +159,7 @@ LOCAL_CFLAGS += \ LOCAL_FORCE_STATIC_EXECUTABLE := true LOCAL_MODULE := static_busybox LOCAL_MODULE_TAGS := optional -LOCAL_STATIC_LIBRARIES := libclearsilverregex libcutils libc libm +LOCAL_STATIC_LIBRARIES := libcutils libc libm LOCAL_MODULE_CLASS := UTILITY_EXECUTABLES LOCAL_MODULE_PATH := $(PRODUCT_OUT)/utilities LOCAL_UNSTRIPPED_PATH := $(PRODUCT_OUT)/symbols/utilities diff --git a/libbb/udp_io.c b/libbb/udp_io.c index 63a710b..7985a97 100644 --- a/libbb/udp_io.c +++ b/libbb/udp_io.c @@ -8,13 +8,6 @@ */ #include "libbb.h" -#if defined(__BIONIC__) && defined(IPV6_PKTINFO) -struct in6_pktinfo { - struct in6_addr ipi6_addr; /* src/dst IPv6 address */ - unsigned int ipi6_ifindex; /* send/recv if index */ -}; -#endif - /* * This asks kernel to let us know dst addr/port of incoming packets * We don't check for errors here. Not supported == won't be used |