Package the 2 llvm-rs-cc versions in the Windows SDK.

[android-x86/development.git] / build / tools / windows_sdk.mk

diff --git a/build/tools/windows_sdk.mk b/build/tools/windows_sdk.mk
index 27bb89a..e259d29 100644 (file)
--- a/build/tools/windows_sdk.mk
+++ b/build/tools/windows_sdk.mk
@@ -46,15 +46,12 @@ WIN_BUILD_PREREQ := \
        llvm-rs-cc
 
 
-# LINUX_SDK_NAME/DIR is set in build/core/Makefile
-WIN_SDK_NAME  := $(subst $(HOST_OS)-$(HOST_ARCH),windows,$(LINUX_SDK_NAME))
-WIN_SDK_DIR   := $(subst $(HOST_OS)-$(HOST_ARCH),windows,$(LINUX_SDK_DIR))
-WIN_SDK_ZIP   := $(WIN_SDK_DIR)/$(WIN_SDK_NAME).zip
+# MAIN_SDK_NAME/DIR is set in build/core/Makefile
+WIN_SDK_NAME := $(subst $(HOST_OS)-$(HOST_ARCH),windows,$(MAIN_SDK_NAME))
+WIN_SDK_DIR  := $(subst $(HOST_OS)-$(HOST_ARCH),windows,$(MAIN_SDK_DIR))
+WIN_SDK_ZIP  := $(WIN_SDK_DIR)/$(WIN_SDK_NAME).zip
 
-# Also dist $(INTERNAL_SDK_TARGET), which is the original linux sdk package.
-# INTERNAL_SDK_TARGET is defined in build/core/Makefile.
-$(call dist-for-goals, win_sdk, $(WIN_SDK_ZIP) \
-    $(INTERNAL_SDK_TARGET))
+$(call dist-for-goals, win_sdk, $(WIN_SDK_ZIP))
 
 .PHONY: win_sdk winsdk-tools
 
@@ -65,10 +62,10 @@ $(info )
 endef
 
 define winsdk-info
-$(info LINUX_SDK_NAME: $(LINUX_SDK_NAME))
-$(info WIN_SDK_NAME  : $(WIN_SDK_NAME))
-$(info WIN_SDK_DIR   : $(WIN_SDK_DIR))
-$(info WIN_SDK_ZIP   : $(WIN_SDK_ZIP))
+$(info MAIN_SDK_NAME: $(MAIN_SDK_NAME))
+$(info WIN_SDK_NAME : $(WIN_SDK_NAME))
+$(info WIN_SDK_DIR  : $(WIN_SDK_DIR))
+$(info WIN_SDK_ZIP  : $(WIN_SDK_ZIP))
 endef
 
 win_sdk: $(WIN_SDK_ZIP)
@@ -76,21 +73,20 @@ win_sdk: $(WIN_SDK_ZIP)
 
 winsdk-tools: $(WIN_BUILD_PREREQ)
        $(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))
        $(call winsdk-info)
        $(hide) rm -rf $(WIN_SDK_DIR)
        $(hide) mkdir -p $(WIN_SDK_DIR)
-       $(hide) cp -rf $(LINUX_SDK_DIR)/$(LINUX_SDK_NAME) $(WIN_SDK_DIR)/$(WIN_SDK_NAME)
+       $(hide) cp -rf $(MAIN_SDK_DIR)/$(MAIN_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)) \
+       $(hide) strip --strip-all $(WIN_SDK_DIR)/$(WIN_SDK_NAME)/platform-tools/llvm-rs-cc.exe
+       $(hide) strip --strip-all $(WIN_SDK_DIR)/$(WIN_SDK_NAME)/platform-tools/llvm-rs-cc-2.exe
+       $(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) && \