external/busybox
| リビジョン | f7ccac9e608cb3545967e7e291009e56dd48c5d5 (tree) |
|---|---|
| 日時 | 2011-06-09 18:58:45 |
| 作者 | Chih-Wei Huang <cwhuang@linu...> |
| コミッター | Chih-Wei Huang |
fix building issues on honeycomb
The project external/clearsilver is removed in honeycomb.
Android.mk (diff)| @@ -1,17 +1,5 @@ | ||
| 1 | 1 | LOCAL_PATH := $(call my-dir) |
| 2 | 2 | |
| 3 | -# Make a static library for clearsilver's regex. This prevents multiple | |
| 4 | -# symbol definition error. | |
| 5 | -include $(CLEAR_VARS) | |
| 6 | -LOCAL_SRC_FILES := ../clearsilver/util/regex/regex.c | |
| 7 | -LOCAL_MODULE := libclearsilverregex | |
| 8 | -LOCAL_MODULE_TAGS := optional | |
| 9 | -LOCAL_C_INCLUDES := \ | |
| 10 | - external/clearsilver \ | |
| 11 | - external/clearsilver/util/regex | |
| 12 | -include $(BUILD_STATIC_LIBRARY) | |
| 13 | - | |
| 14 | - | |
| 15 | 3 | SUBMAKE := make -s -C $(LOCAL_PATH) CC=$(CC) |
| 16 | 4 | KERNEL_MODULES_DIR?=/system/lib/modules |
| 17 | 5 |
| @@ -33,10 +21,7 @@ endif | ||
| 33 | 21 | BUSYBOX_C_INCLUDES = \ |
| 34 | 22 | $(LOCAL_PATH)/include-$(BUSYBOX_CONFIG) \ |
| 35 | 23 | $(LOCAL_PATH)/include $(LOCAL_PATH)/libbb \ |
| 36 | - external/clearsilver \ | |
| 37 | - external/clearsilver/util/regex \ | |
| 38 | - bionic/libc/private \ | |
| 39 | - libc/kernel/common | |
| 24 | + bionic/libc/private | |
| 40 | 25 | |
| 41 | 26 | BUSYBOX_CFLAGS = \ |
| 42 | 27 | -std=gnu99 \ |
| @@ -56,7 +41,6 @@ LOCAL_CFLAGS := $(BUSYBOX_CFLAGS) | ||
| 56 | 41 | LOCAL_MODULE := busybox |
| 57 | 42 | LOCAL_MODULE_TAGS := optional |
| 58 | 43 | LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES) |
| 59 | -LOCAL_STATIC_LIBRARIES += libclearsilverregex | |
| 60 | 44 | include $(BUILD_EXECUTABLE) |
| 61 | 45 | |
| 62 | 46 | BUSYBOX_LINKS := $(shell cat $(LOCAL_PATH)/busybox-$(BUSYBOX_CONFIG).links) |
| @@ -94,7 +78,7 @@ LOCAL_CFLAGS += \ | ||
| 94 | 78 | -Dgenerate_uuid=busybox_generate_uuid |
| 95 | 79 | LOCAL_MODULE := libbusybox |
| 96 | 80 | LOCAL_MODULE_TAGS := optional |
| 97 | -LOCAL_STATIC_LIBRARIES += libclearsilverregex libcutils libc libm | |
| 81 | +LOCAL_STATIC_LIBRARIES += libcutils libc libm | |
| 98 | 82 | include $(BUILD_STATIC_LIBRARY) |
| 99 | 83 | |
| 100 | 84 | # Build a static busybox for the recovery image |
| @@ -114,7 +98,7 @@ LOCAL_CFLAGS += \ | ||
| 114 | 98 | LOCAL_FORCE_STATIC_EXECUTABLE := true |
| 115 | 99 | LOCAL_MODULE := utility_busybox |
| 116 | 100 | LOCAL_MODULE_TAGS := eng |
| 117 | -LOCAL_STATIC_LIBRARIES += libclearsilverregex libcutils libc libm | |
| 101 | +LOCAL_STATIC_LIBRARIES += libcutils libc libm | |
| 118 | 102 | LOCAL_MODULE_CLASS := UTILITY_EXECUTABLES |
| 119 | 103 | LOCAL_MODULE_PATH := $(PRODUCT_OUT)/utilities |
| 120 | 104 | LOCAL_UNSTRIPPED_PATH := $(PRODUCT_OUT)/symbols/utilities |
Fork