Commit: 27caad9905b7346bfb4e93ff98371ecdf7cdf433 - development (git)

development

Commit MetaInfo

• Revisão: 27caad9905b7346bfb4e93ff98371ecdf7cdf433 (tree)
• Hora: 2011-02-04 02:05:11
• Autor: Raphael <raphael@goog...>
• Commiter: Android Git Automerger

Mensagem de Log

am 343c626a: am b0e81c37: Merge "SDK: Strip llvm-rs-cc in Windows SDK."

* commit '343c626adaaf323f13d3d0796cf4c84455496a96':

SDK: Strip llvm-rs-cc in Windows SDK.

Mudança Sumário

• modified: build/tools/windows_sdk.mk

Diff

--- a/build/tools/windows_sdk.mk
+++ b/build/tools/windows_sdk.mk
@@ -71,12 +71,13 @@ $(WIN_SDK_ZIP): winsdk-tools sdk
 	$(hide) mkdir -p $(WIN_SDK_DIR)
 	$(hide) cp -rf $(LINUX_SDK_DIR)/$(LINUX_SDK_NAME) $(WIN_SDK_DIR)/$(WIN_SDK_NAME)
 	$(hide) USB_DRIVER_HOOK=$(USB_DRIVER_HOOK) \
-		$(TOPDIR)development/build/tools/patch_windows_sdk.sh \
-		$(subst @,-q,$(hide)) \
+		$(TOPDIR)development/build/tools/patch_windows_sdk.sh $(subst @,-q,$(hide)) \
 		$(WIN_SDK_DIR)/$(WIN_SDK_NAME) $(OUT_DIR) $(TOPDIR)
-	$(hide) \
-		$(TOPDIR)sdk/build/patch_windows_sdk.sh \
-		$(subst @,-q,$(hide)) \
+	# TODO remove test once llvm-rs-cc is merged
+	$(hide) if [ -f $(WIN_SDK_DIR)/$(WIN_SDK_NAME)/platform-tools/llvm-rs-cc.exe ]; then \
+			strip --strip-all $(WIN_SDK_DIR)/$(WIN_SDK_NAME)/platform-tools/llvm-rs-cc.exe; \
+		fi
+	$(hide) $(TOPDIR)sdk/build/patch_windows_sdk.sh $(subst @,-q,$(hide)) \
 		$(WIN_SDK_DIR)/$(WIN_SDK_NAME) $(OUT_DIR) $(TOPDIR)
 	$(hide) ( \
 		cd $(WIN_SDK_DIR) && \