diff --git a/build/sdk-windows-x86.atree b/build/sdk-windows-x86.atree index 4726aee66..f83122ac7 100644 --- a/build/sdk-windows-x86.atree +++ b/build/sdk-windows-x86.atree @@ -142,7 +142,13 @@ rm build-tools/${PLATFORM_NAME}/lib64/libc++.so.1 rm build-tools/${PLATFORM_NAME}/lld rm build-tools/${PLATFORM_NAME}/lld-bin/lld -prebuilts/sdk/tools/windows/bin/lld.exe strip build-tools/${PLATFORM_NAME}/lld.exe + +# lld linker trampoline (invokes actual lld linker at lld-bin/lld.exe) +bin/lld.exe strip build-tools/${PLATFORM_NAME}/lld.exe + +# actual lld linker, and dependent library +prebuilts/sdk/tools/windows/bin/lld.exe strip build-tools/${PLATFORM_NAME}/lld-bin/lld.exe +prebuilts/sdk/tools/windows/bin/lib64/libwinpthread-1.dll strip build-tools/${PLATFORM_NAME}/lld-bin/libwinpthread-1.dll dalvik/dx/etc/mainDexClasses.bat build-tools/${PLATFORM_NAME}/mainDexClasses.bat diff --git a/build/tools/windows_sdk.mk b/build/tools/windows_sdk.mk index afe21c94c..d510851a4 100644 --- a/build/tools/windows_sdk.mk +++ b/build/tools/windows_sdk.mk @@ -35,6 +35,7 @@ WIN_TARGETS := \ fastboot \ hprof-conv \ libaapt2_jni \ + lld \ llvm-rs-cc \ sqlite3 \ zipalign \