commit 7dca0bb9f0da839a167ce359e90c777ba563c174
author Hung-ying Tyan <tyanh@google.com> Tue Sep 01 05:07:03 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Sep 01 05:07:03 2020 +0000
tree 4fadf2107822d59c14dffbdc197c761ea1396e73
parent 292f5a7071f8809f8d019f5f72359c1a559ae99d
parent 276b441ea3c52b6d5190d50a30b09418e172c208

Merge "Merge branch android10-qpr3-release" into android10-gsi

build/sdk-darwin-x86.atree

diff --git a/build/sdk-darwin-x86.atree b/build/sdk-darwin-x86.atree
index 045017d..67645bd 100644
--- a/build/sdk-darwin-x86.atree
+++ b/build/sdk-darwin-x86.atree
@@ -41,7 +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/darwin/bin/lld   strip build-tools/${PLATFORM_NAME}/lld
+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-linux-x86.atree

diff --git a/build/sdk-linux-x86.atree b/build/sdk-linux-x86.atree
index 0cd29de..c4b1e48 100644
--- a/build/sdk-linux-x86.atree
+++ b/build/sdk-linux-x86.atree
@@ -41,6 +41,8 @@
 prebuilts/sdk/tools/linux/bin/x86_64-linux-android-ld    strip build-tools/${PLATFORM_NAME}/x86_64-linux-android-ld
 prebuilts/sdk/tools/linux/bin/mipsel-linux-android-ld    strip build-tools/${PLATFORM_NAME}/mipsel-linux-android-ld
 
-prebuilts/sdk/tools/linux/bin/lld   strip build-tools/${PLATFORM_NAME}/lld
+prebuilts/sdk/tools/lld                              build-tools/${PLATFORM_NAME}/lld
+prebuilts/sdk/tools/linux/bin/lld              strip build-tools/${PLATFORM_NAME}/lld-bin/lld
+prebuilts/sdk/tools/linux/lib64/libc++.so.1    strip build-tools/${PLATFORM_NAME}/lib64/libc++.so.1
 
 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 80af7ef..f83122a 100644
--- a/build/sdk-windows-x86.atree
+++ b/build/sdk-windows-x86.atree
@@ -138,8 +138,17 @@
 rm build-tools/${PLATFORM_NAME}/mipsel-linux-android-ld
 prebuilts/sdk/tools/windows/bin/mipsel-linux-android-ld.exe    strip build-tools/${PLATFORM_NAME}/mipsel-linux-android-ld.exe
 
+rm build-tools/${PLATFORM_NAME}/lib64/libc++.so.1
+
 rm build-tools/${PLATFORM_NAME}/lld
-prebuilts/sdk/tools/windows/bin/lld.exe   strip build-tools/${PLATFORM_NAME}/lld.exe
+rm build-tools/${PLATFORM_NAME}/lld-bin/lld
+
+# 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 \