LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "win_sdk: temporary disable ALL win_sdk build. DO NOT MERGE."

Browse Source
This commit is contained in:
Raphael Moll
2014-05-03 19:08:56 +00:00
committed by Gerrit Code Review
parent a783fe5f2c 4a747f67b0
commit 4a5687a714
1 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
build/tools/windows_sdk.mk
View File

@@ -30,16 +30,13 @@ include $(TOPDIR)sdk/build/windows_sdk_tools.mk
# This is the list of targets that we want to generate as # This is the list of targets that we want to generate as
# Windows executables. All the targets specified here are located in # Windows executables. All the targets specified here are located in
# the topdir/development directory and are somehow platform-dependent. # 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 := \ WIN_TARGETS := \
aapt adb aidl \ dexdump\
etc1tool \
dexdump dmtracedump \
fastboot \
hprof-conv \
prebuilt \
sqlite3 \
zipalign \
$(WIN_SDK_TARGETS)
###RM(2014-05-02) full list of WIN_TARGS, including bcc/rs that are temporarily deactivated ###RM(2014-05-02) full list of WIN_TARGS, including bcc/rs that are temporarily deactivated
###WIN_TARGETS := \ ###WIN_TARGETS := \
### aapt adb aidl \ ### aapt adb aidl \
@@ -53,7 +50,7 @@ WIN_TARGETS := \
### sqlite3 \ ### sqlite3 \
### zipalign \ ### zipalign \
### $(WIN_SDK_TARGETS) ### $(WIN_SDK_TARGETS)
###
# This is the list of *Linux* build tools that we need # This is the list of *Linux* build tools that we need
# in order to be able to make the WIN_TARGETS. They are # in order to be able to make the WIN_TARGETS. They are
# build prerequisites. # build prerequisites.
@@ -99,13 +96,14 @@ $(WIN_SDK_ZIP): winsdk-tools sdk
$(hide) rm -rf $(WIN_SDK_DIR) $(hide) rm -rf $(WIN_SDK_DIR)
$(hide) mkdir -p $(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) cp -rf $(MAIN_SDK_DIR)/$(MAIN_SDK_NAME) $(WIN_SDK_DIR)/$(WIN_SDK_NAME)
$(hide) USB_DRIVER_HOOK=$(USB_DRIVER_HOOK) \ ###RM(2014-05-02) we want to temporarily stop building ALL windows tools to
PLATFORM_VERSION=$(PLATFORM_VERSION) \ ### $(hide) USB_DRIVER_HOOK=$(USB_DRIVER_HOOK) \
$(TOPDIR)development/build/tools/patch_windows_sdk.sh $(subst @,-q,$(hide)) \ ### PLATFORM_VERSION=$(PLATFORM_VERSION) \
$(WIN_SDK_DIR)/$(WIN_SDK_NAME) $(OUT_DIR) $(TOPDIR) ### $(TOPDIR)development/build/tools/patch_windows_sdk.sh $(subst @,-q,$(hide)) \
$(hide) PLATFORM_VERSION=$(PLATFORM_VERSION) \ ### $(WIN_SDK_DIR)/$(WIN_SDK_NAME) $(OUT_DIR) $(TOPDIR)
$(TOPDIR)sdk/build/patch_windows_sdk.sh $(subst @,-q,$(hide)) \ ### $(hide) PLATFORM_VERSION=$(PLATFORM_VERSION) \
$(WIN_SDK_DIR)/$(WIN_SDK_NAME) $(OUT_DIR) $(TOPDIR) ### $(TOPDIR)sdk/build/patch_windows_sdk.sh $(subst @,-q,$(hide)) \
### $(WIN_SDK_DIR)/$(WIN_SDK_NAME) $(OUT_DIR) $(TOPDIR)
$(hide) ( \ $(hide) ( \
cd $(WIN_SDK_DIR) && \ cd $(WIN_SDK_DIR) && \
rm -f $(WIN_SDK_NAME).zip && \ rm -f $(WIN_SDK_NAME).zip && \