From 4a747f67b05e906a5955b82878bb2a69ea0431f5 Mon Sep 17 00:00:00 2001 From: Raphael Moll Date: Sat, 3 May 2014 11:44:35 -0700 Subject: [PATCH] win_sdk: temporary disable ALL win_sdk build. DO NOT MERGE. This deactivate building all the exe binaries and prevents atree from running (both for dev.git and sdk.git). This still results in a win_sdk folder so that the sdk_repo rule can work, but the generated sdk will only contain linux binaries and is not to be used for production, obviously. Change-Id: I99cd27a050278afae3b62d1ef34a0a1a542bfd1a --- build/tools/windows_sdk.mk | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/build/tools/windows_sdk.mk b/build/tools/windows_sdk.mk index aaf8fa465..6a252262e 100644 --- a/build/tools/windows_sdk.mk +++ b/build/tools/windows_sdk.mk @@ -30,16 +30,13 @@ include $(TOPDIR)sdk/build/windows_sdk_tools.mk # This is the list of targets that we want to generate as # Windows executables. All the targets specified here are located in # the topdir/development directory and are somehow platform-dependent. +###RM(2014-05-02) we want to temporarily stop building ALL windows tools to +###work around a temporary libcutil breakage. However the dependency list can't +###be empty, so we'll still build dexdump which doesn't depend on libcutils and +###still builds. WIN_TARGETS := \ - aapt adb aidl \ - etc1tool \ - dexdump dmtracedump \ - fastboot \ - hprof-conv \ - prebuilt \ - sqlite3 \ - zipalign \ - $(WIN_SDK_TARGETS) + dexdump\ + ###RM(2014-05-02) full list of WIN_TARGS, including bcc/rs that are temporarily deactivated ###WIN_TARGETS := \ ### aapt adb aidl \ @@ -53,7 +50,7 @@ WIN_TARGETS := \ ### sqlite3 \ ### zipalign \ ### $(WIN_SDK_TARGETS) -### + # 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. @@ -99,13 +96,14 @@ $(WIN_SDK_ZIP): winsdk-tools sdk $(hide) rm -rf $(WIN_SDK_DIR) $(hide) mkdir -p $(WIN_SDK_DIR) $(hide) cp -rf $(MAIN_SDK_DIR)/$(MAIN_SDK_NAME) $(WIN_SDK_DIR)/$(WIN_SDK_NAME) - $(hide) USB_DRIVER_HOOK=$(USB_DRIVER_HOOK) \ - PLATFORM_VERSION=$(PLATFORM_VERSION) \ - $(TOPDIR)development/build/tools/patch_windows_sdk.sh $(subst @,-q,$(hide)) \ - $(WIN_SDK_DIR)/$(WIN_SDK_NAME) $(OUT_DIR) $(TOPDIR) - $(hide) PLATFORM_VERSION=$(PLATFORM_VERSION) \ - $(TOPDIR)sdk/build/patch_windows_sdk.sh $(subst @,-q,$(hide)) \ - $(WIN_SDK_DIR)/$(WIN_SDK_NAME) $(OUT_DIR) $(TOPDIR) +###RM(2014-05-02) we want to temporarily stop building ALL windows tools to +### $(hide) USB_DRIVER_HOOK=$(USB_DRIVER_HOOK) \ +### PLATFORM_VERSION=$(PLATFORM_VERSION) \ +### $(TOPDIR)development/build/tools/patch_windows_sdk.sh $(subst @,-q,$(hide)) \ +### $(WIN_SDK_DIR)/$(WIN_SDK_NAME) $(OUT_DIR) $(TOPDIR) +### $(hide) PLATFORM_VERSION=$(PLATFORM_VERSION) \ +### $(TOPDIR)sdk/build/patch_windows_sdk.sh $(subst @,-q,$(hide)) \ +### $(WIN_SDK_DIR)/$(WIN_SDK_NAME) $(OUT_DIR) $(TOPDIR) $(hide) ( \ cd $(WIN_SDK_DIR) && \ rm -f $(WIN_SDK_NAME).zip && \