| author | Koushik Dutta <koushd@gmail.com> | 2011-11-17 02:27:02 (GMT) |
|---|---|---|
| committer | Koushik Dutta <koushd@gmail.com> | 2011-11-17 02:27:02 (GMT) |
| commit | 129a798cc76c7173e68e61c74c7b2015059fd7e0 (patch) | |
| tree | 80b94308dc07f145591c352de876d4828fe5bb33 | |
| parent | 153ca5ab1636e38fe875ea87876dc532a566cc0c (diff) | |
| download | busybox-129a798cc76c7173e68e61c74c7b2015059fd7e0.zip busybox-129a798cc76c7173e68e61c74c7b2015059fd7e0.tar.gz busybox-129a798cc76c7173e68e61c74c7b2015059fd7e0.tar.bz2 | |
fixes for ics
| -rw-r--r-- | Android.mk | 26 | ||||
| -rw-r--r-- | networking/ifconfig.c | 2 |
2 files changed, 14 insertions, 14 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 := libcutils libc libm +LOCAL_STATIC_LIBRARIES := libclearsilverregex 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 := libcutils libc libm +LOCAL_STATIC_LIBRARIES := libclearsilverregex libcutils libc libm LOCAL_MODULE_CLASS := UTILITY_EXECUTABLES LOCAL_MODULE_PATH := $(PRODUCT_OUT)/utilities LOCAL_UNSTRIPPED_PATH := $(PRODUCT_OUT)/symbols/utilities diff --git a/networking/ifconfig.c b/networking/ifconfig.c index b6604f5..1e83bcf 100644 --- a/networking/ifconfig.c +++ b/networking/ifconfig.c @@ -78,7 +78,7 @@ # define IFF_DYNAMIC 0x8000 /* dialup device with changing addresses */ #endif -#if ENABLE_FEATURE_IPV6 +#if ENABLE_FEATURE_IPV6 && !defined(__BIONIC__) struct in6_ifreq { struct in6_addr ifr6_addr; uint32_t ifr6_prefixlen; |