Populate SDK with clang linker (lld) in addition to GNU linker.
Note that clang linker is multi-target whereas GNU linker is
single-target; so while we need multiple GNU linkers (because we
support multiple targets) we only need a single clang linker.
We retain the GNU linkers so that a new SDK is still compatible with
older gradle plugins.
Bug: 142590626
Bug: 144040336
Test: (gLinux) m PRODUCT-sdk_phone_armv7-sdk dist sdk_repo
(gLinux) m PRODUCT-sdk_phone_armv7-win_sdk dist sdk_repo
Change-Id: I2a04f6fd464b5eb6a2e9a632f49409c1d7e60170
(cherry picked from commit c22ed0eece)
This commit is contained in:
@@ -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
|
||||
|
||||
##############################################################################
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -135,6 +135,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
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user