diff options
| author | Raphael Moll <ralf@android.com> | 2014-05-05 22:46:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-05 22:46:37 +0000 |
| commit | 21980124f6aeb923cea50895eab8d6b9c31aba4a (patch) | |
| tree | 4395fec32a97a306e6ac73625595e71301bd10d5 | |
| parent | 4a5687a7144a60826b6fc035459fd691705b72bc (diff) | |
| parent | 438cc639d05117f8af3e8dbb5c341a3d1faf6d4b (diff) | |
| download | development-idea133-weekly-release.tar.gz | |
Merge "Revert "win_sdk: temporary disable ALL win_sdk build. DO NOT MERGE.""idea133-weekly-release
| -rw-r--r-- | build/tools/windows_sdk.mk | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/build/tools/windows_sdk.mk b/build/tools/windows_sdk.mk index 6a252262e..aaf8fa465 100644 --- a/build/tools/windows_sdk.mk +++ b/build/tools/windows_sdk.mk @@ -30,13 +30,16 @@ 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 := \ - dexdump\ - + aapt adb aidl \ + 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 ###WIN_TARGETS := \ ### aapt adb aidl \ @@ -50,7 +53,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. @@ -96,14 +99,13 @@ $(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) -###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) 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 && \ |