diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-19 00:01:48 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-19 00:01:48 +0000 |
| commit | f9f9c88b7e81e32213db0b3597095137d3ba883a (patch) | |
| tree | 342ff1e11b0d95c4e11b3e59b57f8d41ffa7171a | |
| parent | a0f88adc87eda8d99d324a5e8209a857c3fbad2f (diff) | |
| parent | c2151407b3fae1c85a8f578e407447ad1dd86a51 (diff) | |
| download | android_development-f9f9c88b7e81e32213db0b3597095137d3ba883a.tar.gz android_development-f9f9c88b7e81e32213db0b3597095137d3ba883a.tar.bz2 android_development-f9f9c88b7e81e32213db0b3597095137d3ba883a.zip | |
Populate SDK with clang linker (lld) in addition to GNU linker. am: c22ed0eece am: c2151407b3
Change-Id: I1d89a605da8a5723514181ea9ade1d3842c5ad41
| -rw-r--r-- | build/sdk-darwin-x86.atree | 2 | ||||
| -rw-r--r-- | build/sdk-linux-x86.atree | 2 | ||||
| -rw-r--r-- | build/sdk-windows-x86.atree | 3 |
3 files changed, 7 insertions, 0 deletions
diff --git a/build/sdk-darwin-x86.atree b/build/sdk-darwin-x86.atree index b7ab75921..045017dcb 100644 --- a/build/sdk-darwin-x86.atree +++ b/build/sdk-darwin-x86.atree @@ -41,6 +41,8 @@ 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 + dalvik/dx/etc/mainDexClasses build-tools/${PLATFORM_NAME}/mainDexClasses ############################################################################## diff --git a/build/sdk-linux-x86.atree b/build/sdk-linux-x86.atree index c5f97f65e..0cd29deac 100644 --- a/build/sdk-linux-x86.atree +++ b/build/sdk-linux-x86.atree @@ -41,4 +41,6 @@ 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 + dalvik/dx/etc/mainDexClasses build-tools/${PLATFORM_NAME}/mainDexClasses diff --git a/build/sdk-windows-x86.atree b/build/sdk-windows-x86.atree index 449508a6d..80af7efa0 100644 --- a/build/sdk-windows-x86.atree +++ b/build/sdk-windows-x86.atree @@ -138,6 +138,9 @@ 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}/lld +prebuilts/sdk/tools/windows/bin/lld.exe strip build-tools/${PLATFORM_NAME}/lld.exe + dalvik/dx/etc/mainDexClasses.bat build-tools/${PLATFORM_NAME}/mainDexClasses.bat |