Merge "Stop disting the monolithic Windows SDK" am: c7e050889a am: 44cc444cc2 am: 04946bb47c am: a02ee954c0

Original change: https://android-review.googlesource.com/c/platform/development/+/1828993

Change-Id: Ifcad022c1d2a1381190cdd8516f85942e1473cdc
This commit is contained in:
Treehugger Robot
2021-09-17 02:56:12 +00:00
committed by Automerger Merge Worker

View File

@@ -55,8 +55,6 @@ WIN_SDK_NAME := $(subst $(HOST_OS)-$(SDK_HOST_ARCH),windows,$(MAIN_SDK_NAME))
WIN_SDK_DIR := $(subst $(HOST_OS)-$(SDK_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))
# b/36697262 - we want the 64-bit libaapt2_jni and its dependencies
ifdef HOST_CROSS_2ND_ARCH
$(call dist-for-goals,win_sdk,$(ALL_MODULES.host_cross_libaapt2_jni$(HOST_CROSS_2ND_ARCH_MODULE_SUFFIX).BUILT):lib64/libaapt2_jni.dll)