fixes for ics
diff --git a/Android.mk b/Android.mk
index 883be62..3230a91 100644
--- a/Android.mk
+++ b/Android.mk
@@ -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 @@
-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_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_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