diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | .gitreview | 5 | ||||
| -rw-r--r-- | Android.mk | 10 |
3 files changed, 15 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 0a0c65bc3..9acfe93af 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,7 @@ Config.in # Never ignore these # !.gitignore +!.gitreview # # Normal output diff --git a/.gitreview b/.gitreview new file mode 100644 index 000000000..3c5e495bc --- /dev/null +++ b/.gitreview @@ -0,0 +1,5 @@ +[gerrit] +host=android-review.linaro.org +port=29418 +project=platform/external/busybox +defaultbranch=linaro-android diff --git a/Android.mk b/Android.mk index 3709c45f6..3f6ae379f 100644 --- a/Android.mk +++ b/Android.mk @@ -9,9 +9,17 @@ else endif BB_TC_DIR := $(realpath $(shell dirname $(TARGET_TOOLS_PREFIX))) BB_TC_PREFIX := $(shell basename $(TARGET_TOOLS_PREFIX)) -BB_LDFLAGS := -nostdlib -Bdynamic -Wl,-z,muldefs$(shell if test $(PLATFORM_SDK_VERSION) -lt 16; then echo -ne ',-T$(CURDIR)/$(BUILD_SYSTEM)/armelf.x'; fi),-dynamic-linker,$(LINKER_BIN),-z,nocopyreloc,--no-undefined $(CURDIR)/$(TARGET_CRTBEGIN_DYNAMIC_O) $(CURDIR)/$(TARGET_CRTEND_O) $(CURDIR)/$(TARGET_OUT_SHARED_LIBRARIES)/libc.so -L$(CURDIR)/$(TARGET_OUT_SHARED_LIBRARIES) + +## for O and master +target_crtbegin_dynamic_o := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_dynamic.o +target_crtbegin_static_o := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_static.o +target_crtend_o := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtend_android.o + +BB_LDFLAGS := -nostdlib -Bdynamic -Wl,-z,muldefs$(shell if test $(PLATFORM_SDK_VERSION) -lt 16; then echo -ne ',-T$(CURDIR)/$(BUILD_SYSTEM)/armelf.x'; fi),-dynamic-linker,$(LINKER_BIN),-z,nocopyreloc,--no-undefined $(CURDIR)/$(target_crtbegin_dynamic_o) $(CURDIR)/$(target_crtend_o) $(CURDIR)/$(TARGET_OUT_SHARED_LIBRARIES)/libc.so -L$(CURDIR)/$(TARGET_OUT_SHARED_LIBRARIES) # FIXME remove -fno-strict-aliasing once all aliasing violations are fixed BB_COMPILER_FLAGS := $(subst -I ,-I$(CURDIR)/,$(subst -include ,-include $(CURDIR)/,$(TARGET_GLOBAL_CFLAGS))) $(foreach d,$(TARGET_C_INCLUDES),-I$(CURDIR)/$(d)) -fno-stack-protector -Wno-error=format-security -fno-strict-aliasing +# for O and master +BB_COMPILER_FLAGS += $(foreach d,$(TARGET_C_SYSTEM_INCLUDES),-I$(CURDIR)/$(d)) BB_LDLIBS := dl m c gcc ifneq ($(strip $(SHOW_COMMANDS)),) BB_VERBOSE="V=1" |