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

Move lld (darwin, linux) and add dependent libraries

Browse Source 
darwin: Move lld to lld-bin directory; add lib64/libc++.1.dylib; add trampoline

linux: Move lld to lld-bin directory; add lib64/libc++.so.1; add trampoline

Best practice is to ship necessary libraries of expected versions along
with build tools, rather than requiring them to be found elsewhere.

lld depends on libc++.1.dylib (darwin) or libc++.so.1 (linux) and looks for it
in ../lib64, so we need to move lld to an appropriate relative location.
In the old location of lld, we add a simple bash trampoline to invoke
lld in lld-bin; this means Gradle, which invokes lld in the old
location, does not have to change.

Bug: 148267171
Bug: 142590626
Bug: 144040336

Test: (gLinux) m TARGET_PRODUCT=sdk_phone_armv7 TARGET_BUILD_VARIANT=userdebug sdk dist sdk_repo
      (gLinux) m TARGET_PRODUCT=sdk_phone_armv7 TARGET_BUILD_VARIANT=userdebug win_sdk dist sdk_repo
Merged-In: I69b4ef79208bd7d06a377c0761671f1b572abced
Change-Id: I69b4ef79208bd7d06a377c0761671f1b572abced
(cherry picked from commit e9351e5061)
This commit is contained in:
David Gross
2020-02-27 15:11:36 -08:00
parent 3c7d2e3a33
commit e3e67a8212
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/sdk-darwin-x86.atree
View File

@@ -41,7 +41,9 @@ 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/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/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
dalvik/dx/etc/mainDexClasses build-tools/${PLATFORM_NAME}/mainDexClasses dalvik/dx/etc/mainDexClasses build-tools/${PLATFORM_NAME}/mainDexClasses

4
build/sdk-linux-x86.atree
View File

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

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

@@ -138,7 +138,10 @@ prebuilts/sdk/tools/windows/bin/x86_64-linux-android-ld.exe strip build-too
rm build-tools/${PLATFORM_NAME}/mipsel-linux-android-ld 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 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 rm build-tools/${PLATFORM_NAME}/lld
rm build-tools/${PLATFORM_NAME}/lld-bin/lld
prebuilts/sdk/tools/windows/bin/lld.exe strip build-tools/${PLATFORM_NAME}/lld.exe 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 dalvik/dx/etc/mainDexClasses.bat build-tools/${PLATFORM_NAME}/mainDexClasses.bat