From a62e9d2df1a8d929da1f31a576d001c446b614d8 Mon Sep 17 00:00:00 2001 From: Miao Wang Date: Tue, 10 May 2016 14:42:54 -0700 Subject: [PATCH] Add x86_64 linker to Build-Tools for RenderScript. Bug: 27972043 Change-Id: Icc4213d16f43019fe731690656c95cb5b6a74430 --- build/sdk-darwin-x86.atree | 1 + build/sdk-linux-x86.atree | 1 + build/sdk-windows-x86.atree | 3 +++ 3 files changed, 5 insertions(+) diff --git a/build/sdk-darwin-x86.atree b/build/sdk-darwin-x86.atree index 2df63090f..09171213d 100644 --- a/build/sdk-darwin-x86.atree +++ b/build/sdk-darwin-x86.atree @@ -37,6 +37,7 @@ lib64/libc++.dylib strip build-tools/${PLAT 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 dalvik/dx/etc/mainDexClasses build-tools/${PLATFORM_NAME}/mainDexClasses diff --git a/build/sdk-linux-x86.atree b/build/sdk-linux-x86.atree index a84afe684..c77f831a8 100644 --- a/build/sdk-linux-x86.atree +++ b/build/sdk-linux-x86.atree @@ -37,6 +37,7 @@ lib64/libc++.so strip build-tools/${PLATF 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 dalvik/dx/etc/mainDexClasses build-tools/${PLATFORM_NAME}/mainDexClasses diff --git a/build/sdk-windows-x86.atree b/build/sdk-windows-x86.atree index dd9e8a4a3..a88081572 100644 --- a/build/sdk-windows-x86.atree +++ b/build/sdk-windows-x86.atree @@ -110,6 +110,9 @@ prebuilts/sdk/tools/windows/bin/aarch64-linux-android-ld.exe strip build-tools 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