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 2d4f39f..e259d29 100644 (file)
--- a/build/tools/windows_sdk.mk
+++ b/build/tools/windows_sdk.mk
@@ -24,21 +24,32 @@ endif
 
 include $(TOPDIR)sdk/build/windows_sdk_tools.mk
 
+# This is the list of target that we want to generate as
+# Windows executables.
 WIN_TARGETS := \
        aapt adb aidl \
        etc1tool \
        dexdump dmtracedump \
        fastboot \
        hprof-conv \
+       llvm-rs-cc \
        prebuilt \
        sqlite3 \
        zipalign \
        $(WIN_SDK_TARGETS)
 
-# 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
+# This is the list of *Linux* build tools that we need
+# in order to be able to make the WIN_TARGETS. They are
+# build prerequisites.
+WIN_BUILD_PREREQ := \
+       acp \
+       llvm-rs-cc
+
+
+# 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
 
 $(call dist-for-goals, win_sdk, $(WIN_SDK_ZIP))
 
@@ -51,32 +62,30 @@ $(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)
        $(call winsdk-banner,Done)
 
-winsdk-tools: acp
+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)) \
                $(WIN_SDK_DIR)/$(WIN_SDK_NAME) $(OUT_DIR) $(TOPDIR)
-       # 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) 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) ( \