From 50ca1cf796d867d6f378d55fc98a3bb5f69630df Mon Sep 17 00:00:00 2001 From: Ed Heyl Date: Fri, 15 May 2009 15:02:03 -0700 Subject: [PATCH] cherry-pick bd215ed9749f8199085b27ab4f21e687c07e9633 --- cleanspec.mk | 1 + core/combo/linux-arm.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cleanspec.mk b/cleanspec.mk index dd1a1b064..a3a0b0029 100644 --- a/cleanspec.mk +++ b/cleanspec.mk @@ -77,6 +77,7 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/com.an $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/PinyinIMEGoogleService_intermediates) $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/telephony) $(call add-clean-step, rm -rf $(OUT_DIR)/target/product/*/obj/SHARED_LIBRARIES/libwebcore_intermediates) +$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/*/obj) # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST diff --git a/core/combo/linux-arm.mk b/core/combo/linux-arm.mk index f2524455c..f15d29ada 100644 --- a/core/combo/linux-arm.mk +++ b/core/combo/linux-arm.mk @@ -62,7 +62,7 @@ endif # You can set TARGET_TOOLS_PREFIX to get gcc from somewhere else ifeq ($(strip $($(combo_target)TOOLS_PREFIX)),) $(combo_target)TOOLS_PREFIX := \ - prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-eabi-4.3.1/bin/arm-eabi- + prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-eabi-4.2.1/bin/arm-eabi- endif $(combo_target)CC := $($(combo_target)TOOLS_PREFIX)gcc$(HOST_EXECUTABLE_SUFFIX)