commit d4a1f0619bc6a83d75c7b6686f9015eb7b3cec6c
author Dan Albert <danalbert@google.com> Fri Mar 13 19:27:17 2015 -0700
committer Dan Albert <danalbert@google.com> Sat Mar 14 02:34:38 2015 +0000
tree 5d58a899c47298985479592ef53295f72a7ff3eb
parent 170b153b3e3b087f77d806323a685ca0b4597561

Fix SDK library paths for Windows and Darwin too.

Change-Id: Ibaae6fd4089c804f50f8065e614c5de1b71c242b

build/sdk-darwin-x86.atree

diff --git a/build/sdk-darwin-x86.atree b/build/sdk-darwin-x86.atree
index 084dcff..0ebccf2 100644
--- a/build/sdk-darwin-x86.atree
+++ b/build/sdk-darwin-x86.atree
@@ -22,11 +22,11 @@
 # revision as specified in the source.properties.
 
 
-lib/libLLVM.dylib                                     strip build-tools/${PLATFORM_NAME}/libLLVM.dylib
-lib/libbcc.dylib                                      strip build-tools/${PLATFORM_NAME}/libbcc.dylib
-lib/libbcinfo.dylib                                   strip build-tools/${PLATFORM_NAME}/libbcinfo.dylib
-lib/libclang.dylib                                    strip build-tools/${PLATFORM_NAME}/libclang.dylib
-lib/libc++.dylib                                      strip build-tools/${PLATFORM_NAME}/libc++.dylib
+lib/libLLVM.dylib                                     strip build-tools/${PLATFORM_NAME}/../lib/libLLVM.dylib
+lib/libbcc.dylib                                      strip build-tools/${PLATFORM_NAME}/../lib/libbcc.dylib
+lib/libbcinfo.dylib                                   strip build-tools/${PLATFORM_NAME}/../lib/libbcinfo.dylib
+lib/libclang.dylib                                    strip build-tools/${PLATFORM_NAME}/../lib/libclang.dylib
+lib/libc++.dylib                                      strip build-tools/${PLATFORM_NAME}/../lib/libc++.dylib
 
 prebuilts/sdk/tools/darwin/arm-linux-androideabi-ld   strip build-tools/${PLATFORM_NAME}/arm-linux-androideabi-ld
 prebuilts/sdk/tools/darwin/i686-linux-android-ld      strip build-tools/${PLATFORM_NAME}/i686-linux-android-ld

build/sdk-windows-x86.atree

diff --git a/build/sdk-windows-x86.atree b/build/sdk-windows-x86.atree
index 7ff3add..e3c4add 100644
--- a/build/sdk-windows-x86.atree
+++ b/build/sdk-windows-x86.atree
@@ -78,19 +78,19 @@
 rm build-tools/${PLATFORM_NAME}/llvm-rs-cc
 bin/llvm-rs-cc.exe                      strip build-tools/${PLATFORM_NAME}/llvm-rs-cc.exe
 
-rm build-tools/${PLATFORM_NAME}/libLLVM.so
-lib/libLLVM.dll                         strip build-tools/${PLATFORM_NAME}/libLLVM.dll
+rm build-tools/${PLATFORM_NAME}/../lib/libLLVM.so
+lib/libLLVM.dll                         strip build-tools/${PLATFORM_NAME}/../lib/libLLVM.dll
 
-rm build-tools/${PLATFORM_NAME}/libclang.so
-lib/libclang.dll                        strip build-tools/${PLATFORM_NAME}/libclang.dll
+rm build-tools/${PLATFORM_NAME}/../lib/libclang.so
+lib/libclang.dll                        strip build-tools/${PLATFORM_NAME}/../lib/libclang.dll
 
 #bcc not yet compiled on windows
 
-rm build-tools/${PLATFORM_NAME}/libbcc.so
-lib/libbcc.dll                          strip build-tools/${PLATFORM_NAME}/libbcc.dll
+rm build-tools/${PLATFORM_NAME}/../lib/libbcc.so
+lib/libbcc.dll                          strip build-tools/${PLATFORM_NAME}/../lib/libbcc.dll
 
-rm build-tools/${PLATFORM_NAME}/libbcinfo.so
-lib/libbcinfo.dll                       strip build-tools/${PLATFORM_NAME}/libbcinfo.dll
+rm build-tools/${PLATFORM_NAME}/../lib/libbcinfo.so
+lib/libbcinfo.dll                       strip build-tools/${PLATFORM_NAME}/../lib/libbcinfo.dll
 
 rm build-tools/${PLATFORM_NAME}/bcc_compat
 bin/bcc_compat.exe                      strip build-tools/${PLATFORM_NAME}/bcc_compat.exe