diff options
| author | Ben Cheng <bccheng@google.com> | 2012-12-13 11:03:58 -0800 |
|---|---|---|
| committer | Ben Cheng <bccheng@google.com> | 2012-12-13 11:03:58 -0800 |
| commit | 9c68f06a5450223eaefcd165c69fd5336cc2317e (patch) | |
| tree | 1f19d3bdbe695c78eff0f24be92bab072c90610e | |
| parent | 0f28a1d90c5f24355a95e125ba765cf7270ea18b (diff) | |
| parent | ec4caba79cf805a21a7d705cb35ecd89bb598a7f (diff) | |
| download | build-9c68f06a5450223eaefcd165c69fd5336cc2317e.zip build-9c68f06a5450223eaefcd165c69fd5336cc2317e.tar.gz build-9c68f06a5450223eaefcd165c69fd5336cc2317e.tar.bz2 | |
Merge commit 'ec4caba7' into manualmerge
Conflicts:
CleanSpec.mk
Change-Id: Idd8f8f4a896b47bd6275daeb71a24a317da4c98a
| -rw-r--r-- | CleanSpec.mk | 6 | ||||
| -rw-r--r-- | core/combo/TARGET_linux-arm.mk | 6 | ||||
| -rw-r--r-- | core/combo/TARGET_linux-mips.mk | 4 | ||||
| -rw-r--r-- | core/combo/TARGET_linux-x86.mk | 4 |
4 files changed, 16 insertions, 4 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 7f97a80..043fd8a 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -157,6 +157,12 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*) +# GCC 4.7 +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/EXECUTABLES) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/lib/*.o) + # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk index 3955284..25af199 100644 --- a/core/combo/TARGET_linux-arm.mk +++ b/core/combo/TARGET_linux-arm.mk @@ -34,8 +34,10 @@ ifeq ($(strip $(TARGET_ARCH_VARIANT)),) TARGET_ARCH_VARIANT := armv5te endif -ifeq ($(strip $(TARGET_GCC_VERSION)),) -TARGET_GCC_VERSION := 4.6 +ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),) +TARGET_GCC_VERSION := 4.7 +else +TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP) endif TARGET_ARCH_SPECIFIC_MAKEFILE := $(BUILD_COMBOS)/arch/$(TARGET_ARCH)/$(TARGET_ARCH_VARIANT).mk diff --git a/core/combo/TARGET_linux-mips.mk b/core/combo/TARGET_linux-mips.mk index dc28018..c549af9 100644 --- a/core/combo/TARGET_linux-mips.mk +++ b/core/combo/TARGET_linux-mips.mk @@ -34,8 +34,10 @@ ifeq ($(strip $(TARGET_ARCH_VARIANT)),) TARGET_ARCH_VARIANT := mips32r2-fp endif -ifeq ($(strip $(TARGET_GCC_VERSION)),) +ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),) TARGET_GCC_VERSION := 4.6 +else +TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP) endif TARGET_ARCH_SPECIFIC_MAKEFILE := $(BUILD_COMBOS)/arch/$(TARGET_ARCH)/$(TARGET_ARCH_VARIANT).mk diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk index 187e2c2..01b5d02 100644 --- a/core/combo/TARGET_linux-x86.mk +++ b/core/combo/TARGET_linux-x86.mk @@ -22,8 +22,10 @@ ifeq ($(strip $(TARGET_ARCH_VARIANT)),) TARGET_ARCH_VARIANT := x86 endif -ifeq ($(strip $(TARGET_GCC_VERSION)),) +ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),) TARGET_GCC_VERSION := 4.6 +else +TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP) endif # Include the arch-variant-specific configuration file. |