OSDN -- Développer et télécharger des logiciels Open Source
Traduction statut du Français translation status for fr

Android-x86
Fork
Faire un don

  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

external-busybox: Commit

external/busybox


Commit MetaInfo

Révision1a5125fd9b962e32254fea9002ebd133ac0ad79b (tree)
l'heure2017-09-08 20:18:15
AuteurChih-Wei Huang <cwhuang@linu...>
CommiterChih-Wei Huang

Message de Log

Android: change the generated path

Move all generated files to $(local-generated-sources-dir).

Change Summary

Modification

--- a/Android.mk
+++ b/Android.mk
@@ -38,28 +38,6 @@ ifeq ($(HOST_OS),darwin)
3838 BB_PREPARE_FLAGS := HOSTCC=$(BB_HOSTCC)
3939 endif
4040
41-# On aosp (master), path is relative, not on cm (kitkat)
42-bb_gen := $(abspath $(TARGET_OUT_INTERMEDIATES)/busybox)
43-
44-busybox_prepare_full := $(bb_gen)/full/.config
45-$(busybox_prepare_full): $(BB_PATH)/busybox-full.config
46- @echo -e ${CL_YLW}"Prepare config for busybox binary"${CL_RST}
47- @rm -rf $(bb_gen)/full
48- @rm -f $(shell find $(abspath $(call intermediates-dir-for,EXECUTABLES,busybox)) -name "*.o")
49- @mkdir -p $(@D)
50- @cat $^ > $@ && echo "CONFIG_CROSS_COMPILER_PREFIX=\"$(BUSYBOX_CROSS_COMPILER_PREFIX)\"" >> $@
51- make -C $(BB_PATH) prepare O=$(@D) $(BB_PREPARE_FLAGS)
52-
53-busybox_prepare_minimal := $(bb_gen)/minimal/.config
54-$(busybox_prepare_minimal): $(BB_PATH)/busybox-minimal.config
55- @echo -e ${CL_YLW}"Prepare config for libbusybox"${CL_RST}
56- @rm -rf $(bb_gen)/minimal
57- @rm -f $(shell find $(abspath $(call intermediates-dir-for,STATIC_LIBRARIES,libbusybox)) -name "*.o")
58- @mkdir -p $(@D)
59- @cat $^ > $@ && echo "CONFIG_CROSS_COMPILER_PREFIX=\"$(BUSYBOX_CROSS_COMPILER_PREFIX)\"" >> $@
60- make -C $(BB_PATH) prepare O=$(@D) $(BB_PREPARE_FLAGS)
61-
62-
6341 #####################################################################
6442
6543 KERNEL_MODULES_DIR ?= /system/lib/modules
@@ -95,7 +73,6 @@ BUSYBOX_CFLAGS = \
9573 -DNDEBUG \
9674 -fno-strict-aliasing \
9775 -fno-builtin-stpcpy \
98- -include $(bb_gen)/$(BUSYBOX_CONFIG)/include/autoconf.h \
9976 -D'CONFIG_DEFAULT_MODULES_DIR="$(KERNEL_MODULES_DIR)"' \
10077 -D'BB_VER="$(BB_VER) $(BUSYBOX_SUFFIX)"' -DBB_BT=AUTOCONF_TIMESTAMP
10178
@@ -116,7 +93,6 @@ endif
11693 BUSYBOX_CONFIG:=minimal
11794 BUSYBOX_SUFFIX:=static
11895 LOCAL_SRC_FILES := $(BUSYBOX_SRC_FILES)
119-LOCAL_C_INCLUDES := $(bb_gen)/minimal/include $(BUSYBOX_C_INCLUDES)
12096 LOCAL_CFLAGS := -Dmain=busybox_driver $(BUSYBOX_CFLAGS)
12197 LOCAL_CFLAGS += \
12298 -DRECOVERY_VERSION \
@@ -129,8 +105,19 @@ LOCAL_CFLAGS += \
129105 LOCAL_ASFLAGS := $(BUSYBOX_AFLAGS)
130106 LOCAL_MODULE := libbusybox
131107 LOCAL_MODULE_TAGS := eng debug
108+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
132109 LOCAL_STATIC_LIBRARIES := libcutils libc libm libselinux
133-LOCAL_ADDITIONAL_DEPENDENCIES := $(busybox_prepare_minimal)
110+busybox_autoconf_minimal_h := $(local-generated-sources-dir)/include/autoconf.h
111+LOCAL_CFLAGS := $(BUSYBOX_CFLAGS) -include $(busybox_autoconf_minimal_h)
112+LOCAL_C_INCLUDES := $(dir $(busybox_autoconf_minimal_h)) $(BUSYBOX_C_INCLUDES)
113+LOCAL_GENERATED_SOURCES := $(busybox_autoconf_minimal_h)
114+$(busybox_autoconf_minimal_h): $(BB_PATH)/busybox-minimal.config
115+ @echo -e ${CL_YLW}"Prepare config for libbusybox"${CL_RST}
116+ @rm -rf $(dir $($D)) $(local-intermediates-dir)
117+ @mkdir -p $(@D)
118+ $(hide) ( cat $^ && echo "CONFIG_CROSS_COMPILER_PREFIX=\"$(BUSYBOX_CROSS_COMPILER_PREFIX)\"" ) > $(dir $($D)).config
119+ make -C $(BB_PATH) prepare O=$(abspath $(dir $(@D))) $(BB_PREPARE_FLAGS)
120+
134121 include $(BUILD_STATIC_LIBRARY)
135122
136123
@@ -141,15 +128,24 @@ include $(CLEAR_VARS)
141128 BUSYBOX_CONFIG:=full
142129 BUSYBOX_SUFFIX:=bionic
143130 LOCAL_SRC_FILES := $(BUSYBOX_SRC_FILES)
144-LOCAL_C_INCLUDES := $(bb_gen)/full/include $(BUSYBOX_C_INCLUDES)
145-LOCAL_CFLAGS := $(BUSYBOX_CFLAGS)
146131 LOCAL_ASFLAGS := $(BUSYBOX_AFLAGS)
147132 LOCAL_MODULE := busybox
148133 LOCAL_MODULE_TAGS := eng debug
134+LOCAL_MODULE_CLASS := EXECUTABLES
149135 LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
150136 LOCAL_SHARED_LIBRARIES := libc libcutils libm
151137 LOCAL_STATIC_LIBRARIES := libclearsilverregex libuclibcrpc libselinux
152-LOCAL_ADDITIONAL_DEPENDENCIES := $(busybox_prepare_full)
138+busybox_autoconf_full_h := $(local-generated-sources-dir)/include/autoconf.h
139+LOCAL_CFLAGS := $(BUSYBOX_CFLAGS) -include $(busybox_autoconf_full_h)
140+LOCAL_C_INCLUDES := $(dir $(busybox_autoconf_full_h)) $(BUSYBOX_C_INCLUDES)
141+LOCAL_GENERATED_SOURCES := $(busybox_autoconf_full_h)
142+$(busybox_autoconf_full_h): $(BB_PATH)/busybox-full.config
143+ @echo -e ${CL_YLW}"Prepare config for busybox binary"${CL_RST}
144+ @rm -rf $(dir $($D)) $(local-intermediates-dir)
145+ @mkdir -p $(@D)
146+ $(hide) ( cat $^ && echo "CONFIG_CROSS_COMPILER_PREFIX=\"$(BUSYBOX_CROSS_COMPILER_PREFIX)\"" ) > $(dir $(@D)).config
147+ make -C $(BB_PATH) prepare O=$(abspath $(dir $(@D))) $(BB_PREPARE_FLAGS)
148+
153149 include $(BUILD_EXECUTABLE)
154150
155151 BUSYBOX_LINKS := $(shell cat $(BB_PATH)/busybox-$(BUSYBOX_CONFIG).links)
@@ -178,8 +174,6 @@ include $(CLEAR_VARS)
178174 BUSYBOX_CONFIG:=full
179175 BUSYBOX_SUFFIX:=static
180176 LOCAL_SRC_FILES := $(BUSYBOX_SRC_FILES)
181-LOCAL_C_INCLUDES := $(bb_gen)/full/include $(BUSYBOX_C_INCLUDES)
182-LOCAL_CFLAGS := $(BUSYBOX_CFLAGS)
183177 LOCAL_CFLAGS += \
184178 -Dgetusershell=busybox_getusershell \
185179 -Dsetusershell=busybox_setusershell \
@@ -196,5 +190,7 @@ LOCAL_STATIC_LIBRARIES := libclearsilverregex libc libcutils libm libuclibcrpc l
196190 LOCAL_MODULE_CLASS := UTILITY_EXECUTABLES
197191 LOCAL_MODULE_PATH := $(PRODUCT_OUT)/utilities
198192 LOCAL_UNSTRIPPED_PATH := $(PRODUCT_OUT)/symbols/utilities
199-LOCAL_ADDITIONAL_DEPENDENCIES := $(busybox_prepare_full)
193+LOCAL_CFLAGS := $(BUSYBOX_CFLAGS) -include $(busybox_autoconf_full_h)
194+LOCAL_C_INCLUDES := $(dir $(busybox_autoconf_full_h)) $(BUSYBOX_C_INCLUDES)
195+LOCAL_GENERATED_SOURCES := $(busybox_autoconf_full_h)
200196 include $(BUILD_EXECUTABLE)
Afficher sur ancien navigateur de dépôt.