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

Place a dummy file at the location of each (previously removed) old GNU linker

Browse Source 
Previously, old GNU linkers were removed, in favor of the LLVM linker
lld.  However, old versions of AGP consider the absence of those linkers
to mean that the build tools are corrupted.  To solve this problem, we
provide a (non-executable) dummy file in place of each old GNU linker to
keep AGP satisfied.  A compatibility mode RenderScript build by those
old versions of AGP will fail (as it would have without the dummy
files), but everything else should work.

Bug: 153685081
Bug: 144040336
Bug: 142590626

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
Change-Id: I7574c850bfb593df5bcb9131ea8915061b0083e1
This commit is contained in:
David Gross
2020-04-29 14:26:10 -07:00
parent 0c501136ca
commit 940757220e
3 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,6 +35,12 @@ lib64/libclang_android.dylib strip build-tools/${PLAT
lib64/libc++.dylib strip build-tools/${PLATFORM_NAME}/lib64/libc++.dylib
lib64/libaapt2_jni.dylib strip build-tools/${PLATFORM_NAME}/lib64/libaapt2_jni.dylib
prebuilts/sdk/tools/lld-dummy build-tools/${PLATFORM_NAME}/arm-linux-androideabi-ld
prebuilts/sdk/tools/lld-dummy build-tools/${PLATFORM_NAME}/aarch64-linux-android-ld
prebuilts/sdk/tools/lld-dummy build-tools/${PLATFORM_NAME}/i686-linux-android-ld
prebuilts/sdk/tools/lld-dummy build-tools/${PLATFORM_NAME}/x86_64-linux-android-ld
prebuilts/sdk/tools/lld-dummy build-tools/${PLATFORM_NAME}/mipsel-linux-android-ld
prebuilts/sdk/tools/lld build-tools/${PLATFORM_NAME}/lld
prebuilts/sdk/tools/darwin/lld-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

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

@@ -35,6 +35,12 @@ lib64/libclang_android.so strip build-tools/${PLATF
lib64/libc++.so strip build-tools/${PLATFORM_NAME}/lib64/libc++.so
lib64/libaapt2_jni.so strip build-tools/${PLATFORM_NAME}/lib64/libaapt2_jni.so
prebuilts/sdk/tools/lld-dummy build-tools/${PLATFORM_NAME}/arm-linux-androideabi-ld
prebuilts/sdk/tools/lld-dummy build-tools/${PLATFORM_NAME}/aarch64-linux-android-ld
prebuilts/sdk/tools/lld-dummy build-tools/${PLATFORM_NAME}/i686-linux-android-ld
prebuilts/sdk/tools/lld-dummy build-tools/${PLATFORM_NAME}/x86_64-linux-android-ld
prebuilts/sdk/tools/lld-dummy build-tools/${PLATFORM_NAME}/mipsel-linux-android-ld
prebuilts/sdk/tools/lld build-tools/${PLATFORM_NAME}/lld
prebuilts/sdk/tools/linux/lld-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

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

@@ -123,6 +123,21 @@ lib/libbcinfo.dll strip build-tools/${PLATFORM_NAME}/libbc
rm build-tools/${PLATFORM_NAME}/bcc_compat
bin/bcc_compat.exe strip build-tools/${PLATFORM_NAME}/bcc_compat.exe
rm build-tools/${PLATFORM_NAME}/arm-linux-androideabi-ld
prebuilts/sdk/tools/lld-dummy build-tools/${PLATFORM_NAME}/arm-linux-androideabi-ld.exe
rm build-tools/${PLATFORM_NAME}/aarch64-linux-android-ld
prebuilts/sdk/tools/lld-dummy build-tools/${PLATFORM_NAME}/aarch64-linux-android-ld.exe
rm build-tools/${PLATFORM_NAME}/i686-linux-android-ld
prebuilts/sdk/tools/lld-dummy build-tools/${PLATFORM_NAME}/i686-linux-android-ld.exe
rm build-tools/${PLATFORM_NAME}/x86_64-linux-android-ld
prebuilts/sdk/tools/lld-dummy build-tools/${PLATFORM_NAME}/x86_64-linux-android-ld.exe
rm build-tools/${PLATFORM_NAME}/mipsel-linux-android-ld
prebuilts/sdk/tools/lld-dummy build-tools/${PLATFORM_NAME}/mipsel-linux-android-ld.exe
rm build-tools/${PLATFORM_NAME}/lib64/libc++.so.1
rm build-tools/${PLATFORM_NAME}/lld