LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move lld.exe (windows) and add dependent library libwinpthread-1.dll am: 7fe8024a20

Browse Source 
Change-Id: I3e33565905031fe25495dc93dce02da60c376af6
This commit is contained in:
Automerger Merge Worker
2020-03-12 17:53:10 +00:00
parent 1578f6602b 7fe8024a20
commit c41cd4595c
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
build/sdk-windows-x86.atree
View File

@@ -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
rm build-tools/${PLATFORM_NAME}/lld-bin/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 dalvik/dx/etc/mainDexClasses.bat build-tools/${PLATFORM_NAME}/mainDexClasses.bat

1
build/tools/windows_sdk.mk
View File

@@ -35,6 +35,7 @@ WIN_TARGETS := \
fastboot \ fastboot \
hprof-conv \ hprof-conv \
libaapt2_jni \ libaapt2_jni \
lld \
llvm-rs-cc \ llvm-rs-cc \
sqlite3 \ sqlite3 \
zipalign \ zipalign \