From 058dd79b8025c44daed66851e87c9d239aa7dce4 Mon Sep 17 00:00:00 2001 From: David Gross Date: Mon, 30 Mar 2020 11:08:31 -0700 Subject: [PATCH] Remove old GNU linkers from SDK. Linkers aarch64-linux-android-ld and x86_64-linux-android-ld were built with a minimum macOS deployment target lower than 10.9, so they cannot be signed and notarized. Rather than try to produce newer versions of these linkers (which are obsolete in the SDK anyway), we remove them (so that all of the SDK can be signed and notarized). Rather than introduce an inconsistency among the linkers for a particular host (there are three other GNU linkers that don't have this problem) or across hosts (there are no issues on linux or windows), we remove all of the GNU linkers, not just the two problematic ones. Only newer gradle plugins (those that look for the clang linker lld) will work with the new SDK from which those old linkers have been removed. Bug: 152337684 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 Inspect sdk-repo-{linux,windows}-build-tools-eng.*.zip Merged-In: Iccfa870a826de3f12c99175e0761ea00fe2876ed Change-Id: Iccfa870a826de3f12c99175e0761ea00fe2876ed (cherry picked from commit cb255acf7735f10079c48e7aa55b81dec1bdaaaa) --- build/sdk-darwin-x86.atree | 6 ------ build/sdk-linux-x86.atree | 6 ------ build/sdk-windows-x86.atree | 15 --------------- 3 files changed, 27 deletions(-) diff --git a/build/sdk-darwin-x86.atree b/build/sdk-darwin-x86.atree index 67645bd58..605682cd8 100644 --- a/build/sdk-darwin-x86.atree +++ b/build/sdk-darwin-x86.atree @@ -35,12 +35,6 @@ 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/darwin/bin/arm-linux-androideabi-ld strip build-tools/${PLATFORM_NAME}/arm-linux-androideabi-ld -prebuilts/sdk/tools/darwin/bin/aarch64-linux-android-ld strip build-tools/${PLATFORM_NAME}/aarch64-linux-android-ld -prebuilts/sdk/tools/darwin/bin/i686-linux-android-ld strip build-tools/${PLATFORM_NAME}/i686-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/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 diff --git a/build/sdk-linux-x86.atree b/build/sdk-linux-x86.atree index c4b1e4863..6b5714200 100644 --- a/build/sdk-linux-x86.atree +++ b/build/sdk-linux-x86.atree @@ -35,12 +35,6 @@ 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/linux/bin/arm-linux-androideabi-ld strip build-tools/${PLATFORM_NAME}/arm-linux-androideabi-ld -prebuilts/sdk/tools/linux/bin/aarch64-linux-android-ld strip build-tools/${PLATFORM_NAME}/aarch64-linux-android-ld -prebuilts/sdk/tools/linux/bin/i686-linux-android-ld strip build-tools/${PLATFORM_NAME}/i686-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/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 diff --git a/build/sdk-windows-x86.atree b/build/sdk-windows-x86.atree index f83122ac7..77e33dcb1 100644 --- a/build/sdk-windows-x86.atree +++ b/build/sdk-windows-x86.atree @@ -123,21 +123,6 @@ 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/windows/bin/arm-linux-androideabi-ld.exe strip build-tools/${PLATFORM_NAME}/arm-linux-androideabi-ld.exe - -rm build-tools/${PLATFORM_NAME}/aarch64-linux-android-ld -prebuilts/sdk/tools/windows/bin/aarch64-linux-android-ld.exe strip build-tools/${PLATFORM_NAME}/aarch64-linux-android-ld.exe - -rm build-tools/${PLATFORM_NAME}/i686-linux-android-ld -prebuilts/sdk/tools/windows/bin/i686-linux-android-ld.exe strip build-tools/${PLATFORM_NAME}/i686-linux-android-ld.exe - -rm build-tools/${PLATFORM_NAME}/x86_64-linux-android-ld -prebuilts/sdk/tools/windows/bin/x86_64-linux-android-ld.exe strip build-tools/${PLATFORM_NAME}/x86_64-linux-android-ld.exe - -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