From b7125622c8e5272c9b031b947ddad218f1326475 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Fri, 13 Mar 2015 11:25:32 -0700 Subject: [PATCH] Fix library paths for SDK tools. The rpath for the binaries is ../lib but the libraries were being installed to the same directory as the executables. Bug: 19617220 Change-Id: I5c4158698b6703843b67543d4396e2bffc5fb313 --- build/sdk-linux-x86.atree | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build/sdk-linux-x86.atree b/build/sdk-linux-x86.atree index 6eb976b47..71b5c0d89 100644 --- a/build/sdk-linux-x86.atree +++ b/build/sdk-linux-x86.atree @@ -22,11 +22,11 @@ # revision as specified in the source.properties. -lib/libLLVM.so strip build-tools/${PLATFORM_NAME}/libLLVM.so -lib/libbcc.so strip build-tools/${PLATFORM_NAME}/libbcc.so -lib/libbcinfo.so strip build-tools/${PLATFORM_NAME}/libbcinfo.so -lib/libclang.so strip build-tools/${PLATFORM_NAME}/libclang.so -lib/libc++.so strip build-tools/${PLATFORM_NAME}/libc++.so +lib/libLLVM.so strip build-tools/${PLATFORM_NAME}/../lib/libLLVM.so +lib/libbcc.so strip build-tools/${PLATFORM_NAME}/../lib/libbcc.so +lib/libbcinfo.so strip build-tools/${PLATFORM_NAME}/../lib/libbcinfo.so +lib/libclang.so strip build-tools/${PLATFORM_NAME}/../lib/libclang.so +lib/libc++.so strip build-tools/${PLATFORM_NAME}/../lib/libc++.so prebuilts/sdk/tools/linux/arm-linux-androideabi-ld strip build-tools/${PLATFORM_NAME}/arm-linux-androideabi-ld prebuilts/sdk/tools/linux/i686-linux-android-ld strip build-tools/${PLATFORM_NAME}/i686-linux-android-ld