diff options
| author | Ben Cheng <bccheng@google.com> | 2012-12-12 09:33:13 -0800 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-12-12 09:33:13 -0800 |
| commit | 98ce73b27a9df7795cc91ea9ca5781d3255828c7 (patch) | |
| tree | c5c4077f6117e2c6b0efd4158dd869c820fe5447 | |
| parent | 62f1d86e4850bdc4f470cf1f0c2428f5b427a347 (diff) | |
| parent | 5011dd80ee4aff6254bd5600429b3ced1e52f792 (diff) | |
| download | build-98ce73b27a9df7795cc91ea9ca5781d3255828c7.tar.gz | |
Merge "Refresh ARM toolchain to GCC 4.7 / binutils 2.22."
| -rw-r--r-- | CleanSpec.mk | 6 | ||||
| -rw-r--r-- | core/combo/TARGET_linux-arm.mk | 2 | ||||
| -rw-r--r-- | envsetup.sh | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index f4d45ff5ab..c20d401a6b 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -150,6 +150,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/*) +# For GCC 4.7 toolchain change +$(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 8be89c4d51..99b2f8c060 100644 --- a/core/combo/TARGET_linux-arm.mk +++ b/core/combo/TARGET_linux-arm.mk @@ -35,7 +35,7 @@ TARGET_ARCH_VARIANT := armv5te endif ifeq ($(strip $(TARGET_GCC_VERSION)),) -TARGET_GCC_VERSION := 4.6 +TARGET_GCC_VERSION := 4.7 endif TARGET_ARCH_SPECIFIC_MAKEFILE := $(BUILD_COMBOS)/arch/$(TARGET_ARCH)/$(TARGET_ARCH_VARIANT).mk diff --git a/envsetup.sh b/envsetup.sh index 2d9d245bd7..3aeb52b724 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -116,7 +116,7 @@ function setpaths() prebuiltdir=$(getprebuilt) gccprebuiltdir=$(get_abs_build_var ANDROID_GCC_PREBUILTS) - # defined in core/config.mk + # defined in core/combo/TARGET_linux-{arm,mips,x86}.mk targetgccversion=$(get_build_var TARGET_GCC_VERSION) export TARGET_GCC_VERSION=$targetgccversion |