Commit: 343c626adaaf323f13d3d0796cf4c84455496a96 - development (git)

development

Commit MetaInfo

• Révision: 343c626adaaf323f13d3d0796cf4c84455496a96 (tree)
• l'heure: 2011-02-04 01:56:28
• Auteur: Raphael <raphael@goog...>
• Commiter: Android Git Automerger

Message de Log

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

* commit 'b0e81c371883a8f7f2cfa9a01f8b65d4a2423dcf':

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

Change Summary

• modified: build/tools/windows_sdk.mk

Modification

--- 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) && \