resolved conflicts for merge of 1a6a849b to gingerbread-plus-aosp

Change-Id: I05bf91403b3160ff6db7b9a60b3c1c5f1ded0c5b
This commit is contained in:
Ying Wang
2011-03-11 12:59:56 -08:00

View File

@@ -62,7 +62,7 @@ win_sdk: $(WIN_SDK_ZIP)
winsdk-tools: acp
$(call winsdk-banner,Build Windows Tools)
$(hide) USE_MINGW=1 $(MAKE) PRODUCT-$(TARGET_PRODUCT)-$(strip $(WIN_TARGETS)) $(if $(hide),,showcommands)
$(hide) USE_MINGW=1 USE_CCACHE="" $(MAKE) PRODUCT-$(TARGET_PRODUCT)-$(strip $(WIN_TARGETS)) $(if $(hide),,showcommands)
$(WIN_SDK_ZIP): winsdk-tools sdk
$(call winsdk-banner,Build $(WIN_SDK_NAME))