diff options
| author | Kevin F. Haggerty <haggertk@lineageos.org> | 2020-06-01 17:20:20 -0600 |
|---|---|---|
| committer | Kevin F. Haggerty <haggertk@lineageos.org> | 2020-06-01 17:20:20 -0600 |
| commit | 381803470ee7248d9c59f6774a52dea0e2cb6ef2 (patch) | |
| tree | c08fbd11bb1f358db14d77333e83d6d3a7adc979 | |
| parent | a9dcc422996791263c7aad6b3d22ef0498ffe61b (diff) | |
| parent | 1f6a53e318fb734fef5f90153e63faad9c2ade68 (diff) | |
| download | android_development-lineage-17.1.tar.gz android_development-lineage-17.1.tar.bz2 android_development-lineage-17.1.zip | |
Merge tag 'android-10.0.0_r37' into staging/lineage-17.1_merge-android-10.0.0_r37lineage-17.1
Android 10.0.0 Release 37 (QQ3A.200605.001)
* tag 'android-10.0.0_r37':
For darwin, add lib64/libc++abi.1.dylib.
Move lld.exe (windows) and add dependent library libwinpthread-1.dll
Move lld (darwin, linux) and add dependent libraries
Change-Id: Id112dbb769751e12ea27ba962d5e66f2ca95ba51
| -rw-r--r-- | build/sdk-darwin-x86.atree | 5 | ||||
| -rw-r--r-- | build/sdk-linux-x86.atree | 4 | ||||
| -rw-r--r-- | build/sdk-windows-x86.atree | 11 | ||||
| -rw-r--r-- | build/tools/windows_sdk.mk | 1 |
4 files changed, 18 insertions, 3 deletions
diff --git a/build/sdk-darwin-x86.atree b/build/sdk-darwin-x86.atree index 045017dcb..67645bd58 100644 --- a/build/sdk-darwin-x86.atree +++ b/build/sdk-darwin-x86.atree @@ -41,7 +41,10 @@ prebuilts/sdk/tools/darwin/bin/i686-linux-android-ld strip build-tools/${PL 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 diff --git a/build/sdk-linux-x86.atree b/build/sdk-linux-x86.atree index 0cd29deac..c4b1e4863 100644 --- a/build/sdk-linux-x86.atree +++ b/build/sdk-linux-x86.atree @@ -41,6 +41,8 @@ prebuilts/sdk/tools/linux/bin/i686-linux-android-ld strip build-tools/${PLA 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 diff --git a/build/sdk-windows-x86.atree b/build/sdk-windows-x86.atree index 80af7efa0..f83122ac7 100644 --- a/build/sdk-windows-x86.atree +++ b/build/sdk-windows-x86.atree @@ -138,8 +138,17 @@ prebuilts/sdk/tools/windows/bin/x86_64-linux-android-ld.exe strip build-too 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 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 \ |