24e52959d7
Move lld.exe to lld-bin directory; add lld-bin/libwinpthread-1.dll; add
trampoline.
Best practice is to ship necessary libraries of expected versions along
with build tools, rather than requiring them to be found elsewhere.
lld.exe depends on libwinpthread-1.dll and windows looks for it in the
same directory as lld.exe. Unfortunately, there's already a 32-bit
libwinpthread-1.dll at the tool root (used by 32-bit executables at
the tool root), and lld.exe is a 64-bit executable, so it needs its own
directory and its own library.
In the old location of lld.exe, we add a trampoline executable (a build
artifact) in lld-bin; this means Gradle, which invokes lld.exe in the old
location, does not have to change.
Bug: 148267171
Bug: 142590626
Bug: 144040336
Test: (gLinux) m TARGET_PRODUCT=sdk_phone_armv7 TARGET_BUILD_VARIANT=userdebug sdk dist sdk_repo
(gLinux) m TARGET_PRODUCT=sdk_phone_armv7 TARGET_BUILD_VARIANT=userdebug win_sdk dist sdk_repo
Change-Id: Ice6710ed204a25d09ac596207c02b8b99ca95b8b
79 lines
2.6 KiB
Makefile
79 lines
2.6 KiB
Makefile
# Makefile to build the Windows SDK under linux.
|
|
#
|
|
# This file is included by build/core/Makefile when a PRODUCT-sdk-win_sdk build
|
|
# is requested.
|
|
#
|
|
# Summary of operations:
|
|
# - create a regular Linux SDK
|
|
# - build a few Windows tools
|
|
# - mirror the linux SDK directory and patch it with the Windows tools
|
|
#
|
|
# This way we avoid the headache of building a full SDK in MinGW mode, which is
|
|
# made complicated by the fact the build system does not support cross-compilation.
|
|
|
|
# We can only use this under Linux
|
|
ifneq ($(shell uname),Linux)
|
|
$(error Linux is required to create a Windows SDK)
|
|
endif
|
|
ifeq ($(strip $(shell which unix2dos todos 2>/dev/null)),)
|
|
$(error Need a unix2dos command. Please 'apt-get install tofrodos')
|
|
endif
|
|
|
|
# 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.
|
|
WIN_TARGETS := \
|
|
aapt \
|
|
aapt2 \
|
|
adb \
|
|
aidl \
|
|
aprotoc \
|
|
bcc_compat \
|
|
clang \
|
|
etc1tool \
|
|
dexdump dmtracedump \
|
|
fastboot \
|
|
hprof-conv \
|
|
libaapt2_jni \
|
|
lld \
|
|
llvm-rs-cc \
|
|
sqlite3 \
|
|
zipalign \
|
|
split-select
|
|
|
|
WIN_TARGETS := $(foreach t,$(WIN_TARGETS),$(ALL_MODULES.host_cross_$(t).INSTALLED))
|
|
|
|
# MAIN_SDK_NAME/DIR is set in build/core/Makefile
|
|
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)
|
|
$(call dist-for-goals, win_sdk, prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32/bin/libwinpthread-1.dll:lib64/libwinpthread-1.dll)
|
|
endif
|
|
|
|
.PHONY: win_sdk winsdk-tools
|
|
|
|
win_sdk: $(WIN_SDK_ZIP)
|
|
|
|
winsdk-tools: $(WIN_TARGETS)
|
|
|
|
$(WIN_SDK_ZIP): $(WIN_TARGETS) $(INTERNAL_SDK_TARGET) $(SOONG_ZIP) \
|
|
$(HOST_OUT_EXECUTABLES)/atree \
|
|
development/build/tools/patch_windows_sdk.sh \
|
|
development/build/sdk-windows-x86.atree
|
|
@echo Build Windows SDK $(WIN_SDK_NAME)
|
|
$(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) \
|
|
ATREE_STRIP=$(HOST_STRIP) \
|
|
development/build/tools/patch_windows_sdk.sh -q \
|
|
$(WIN_SDK_DIR)/$(WIN_SDK_NAME) $(OUT_DIR) $(TOPDIR)
|
|
$(hide) $(SOONG_ZIP) -d -C $(WIN_SDK_DIR) -D $(WIN_SDK_DIR)/$(WIN_SDK_NAME) -o $@
|