commit 24edab549623bcaea6e88832b2a977efdf26897d
author android-build-team Robot <android-build-team-robot@google.com> Thu Mar 12 23:03:56 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Mar 12 23:03:56 2020 +0000
tree 4fadf2107822d59c14dffbdc197c761ea1396e73
parent 289e8fe7afe5ecce712942e36cb2b6c4514ecfc0
parent 6a35354abdac19fa41ad1a61d49293cc7988630a

Snap for 6290860 from 6a35354abdac19fa41ad1a61d49293cc7988630a to qt-d4-release

Change-Id: Ib81010badaac756756c56e2ae7386efde0616ad8

build/sdk-darwin-x86.atree

diff --git a/build/sdk-darwin-x86.atree b/build/sdk-darwin-x86.atree
index b278c10..67645bd 100644
--- a/build/sdk-darwin-x86.atree
+++ b/build/sdk-darwin-x86.atree
@@ -41,9 +41,10 @@
 prebuilts/sdk/tools/darwin/bin/x86_64-linux-android-ld    strip build-tools/${PLATFORM_NAME}/x86_64-linux-android-ld
 prebuilts/sdk/tools/darwin/bin/mipsel-linux-android-ld    strip build-tools/${PLATFORM_NAME}/mipsel-linux-android-ld
 
-prebuilts/sdk/tools/lld                                 build-tools/${PLATFORM_NAME}/lld
-prebuilts/sdk/tools/darwin/bin/lld                strip build-tools/${PLATFORM_NAME}/lld-bin/lld
-prebuilts/sdk/tools/darwin/lib64/libc++.1.dylib   strip build-tools/${PLATFORM_NAME}/lib64/libc++.1.dylib
+prebuilts/sdk/tools/lld                                    build-tools/${PLATFORM_NAME}/lld
+prebuilts/sdk/tools/darwin/bin/lld                   strip build-tools/${PLATFORM_NAME}/lld-bin/lld
+prebuilts/sdk/tools/darwin/lib64/libc++.1.dylib      strip build-tools/${PLATFORM_NAME}/lib64/libc++.1.dylib
+prebuilts/sdk/tools/darwin/lib64/libc++abi.1.dylib   strip build-tools/${PLATFORM_NAME}/lib64/libc++abi.1.dylib
 
 dalvik/dx/etc/mainDexClasses                                build-tools/${PLATFORM_NAME}/mainDexClasses
 

build/sdk-windows-x86.atree

diff --git a/build/sdk-windows-x86.atree b/build/sdk-windows-x86.atree
index 4726aee..f83122a 100644
--- a/build/sdk-windows-x86.atree
+++ b/build/sdk-windows-x86.atree
@@ -142,7 +142,13 @@
 
 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
 

build/tools/windows_sdk.mk

diff --git a/build/tools/windows_sdk.mk b/build/tools/windows_sdk.mk
index afe21c9..d510851 100644
--- a/build/tools/windows_sdk.mk
+++ b/build/tools/windows_sdk.mk
@@ -35,6 +35,7 @@
 	fastboot \
 	hprof-conv \
 	libaapt2_jni \
+	lld \
 	llvm-rs-cc \
 	sqlite3 \
 	zipalign \