Add support for dynamically linked llvm-rs-cc

Change-Id: I801d59317e782a12ad82d00dec52d688061b470b

59 files changed, 70 insertions, 61 deletions

diff --git a/builder/src/main/java/com/android/builder/AndroidBuilder.java b/builder/src/main/java/com/android/builder/AndroidBuilder.java
index 6e32247..9442f4d 100644
--- a/builder/src/main/java/com/android/builder/AndroidBuilder.java
+++ b/builder/src/main/java/com/android/builder/AndroidBuilder.java
@@ -614,7 +614,7 @@ public class AndroidBuilder {
             command.add(symbolOutputDir);
         }
 
-        mCmdLineRunner.runCmdLine(command);
+        mCmdLineRunner.runCmdLine(command, null);
 
         // now if the project has libraries, R needs to be created for each libraries,
         // but only if the current project is not a library.
@@ -856,7 +856,16 @@ public class AndroidBuilder {
             command.add(sourceFile.getAbsolutePath());
         }
 
-        mCmdLineRunner.runCmdLine(command);
+        Map<String, String> env = null;
+        if (SdkConstants.CURRENT_PLATFORM == SdkConstants.PLATFORM_DARWIN) {
+            env = Maps.newHashMap();
+            env.put("DYLD_LIBRARY_PATH", mBuildTools.getLocation().getAbsolutePath());
+        } else if (SdkConstants.CURRENT_PLATFORM == SdkConstants.PLATFORM_LINUX) {
+            env = Maps.newHashMap();
+            env.put("LD_LIBRARY_PATH", mBuildTools.getLocation().getAbsolutePath());
+        }
+
+        mCmdLineRunner.runCmdLine(command, env);
     }
 
     /**
@@ -986,7 +995,7 @@ public class AndroidBuilder {
             command.add(proguardFile.getAbsolutePath());
         }
 
-        mCmdLineRunner.runCmdLine(command);
+        mCmdLineRunner.runCmdLine(command, null);
     }
 
     /**
diff --git a/builder/src/main/java/com/android/builder/internal/compiler/AidlProcessor.java b/builder/src/main/java/com/android/builder/internal/compiler/AidlProcessor.java
index 0539752..a50029e 100644
--- a/builder/src/main/java/com/android/builder/internal/compiler/AidlProcessor.java
+++ b/builder/src/main/java/com/android/builder/internal/compiler/AidlProcessor.java
@@ -79,7 +79,7 @@ public class AidlProcessor implements SourceSearcher.SourceFileProcessor {
 
         command.add(sourceFile.getAbsolutePath());
 
-        mRunner.runCmdLine(command);
+        mRunner.runCmdLine(command, null);
 
         // send the dependency file to the processor.
         if (mDependencyFileProcessor.processFile(depFile)) {
diff --git a/tests/3rdPartyTests/app/build.gradle b/tests/3rdPartyTests/app/build.gradle
index c485390..9d89e95 100644
--- a/tests/3rdPartyTests/app/build.gradle
+++ b/tests/3rdPartyTests/app/build.gradle
@@ -5,7 +5,7 @@ project.ext.fakeServer = new com.android.tests.basic.buildscript.FakeServer()
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 
     deviceProvider project.ext.fakeProvider
     testServer project.ext.fakeServer
diff --git a/tests/3rdPartyTests/lib/build.gradle b/tests/3rdPartyTests/lib/build.gradle
index cd9a63d..75ef7d6 100644
--- a/tests/3rdPartyTests/lib/build.gradle
+++ b/tests/3rdPartyTests/lib/build.gradle
@@ -5,7 +5,7 @@ project.ext.fakeServer = new com.android.tests.basic.buildscript.FakeServer()
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 
     deviceProvider project.ext.fakeProvider
     testServer project.ext.fakeServer
diff --git a/tests/aidl/build.gradle b/tests/aidl/build.gradle
index 86fd4c2..2890aed 100644
--- a/tests/aidl/build.gradle
+++ b/tests/aidl/build.gradle
@@ -10,6 +10,6 @@ apply plugin: 'android'
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 
 }
\ No newline at end of file
diff --git a/tests/api/app/build.gradle b/tests/api/app/build.gradle
index 69d1475..c307fc8 100644
--- a/tests/api/app/build.gradle
+++ b/tests/api/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'android'
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 }
 
 // query for all (non-test) variants and inject a new step in the builds
diff --git a/tests/api/lib/build.gradle b/tests/api/lib/build.gradle
index 49537ff..b2cbda8 100644
--- a/tests/api/lib/build.gradle
+++ b/tests/api/lib/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'android-library'
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 }
 
 // query for all (non-test) variants and inject a new step in the builds
diff --git a/tests/applibtest/app/build.gradle b/tests/applibtest/app/build.gradle
index d0ed37e..39e5199 100644
--- a/tests/applibtest/app/build.gradle
+++ b/tests/applibtest/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'android'
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 }
 
 //
diff --git a/tests/applibtest/lib/build.gradle b/tests/applibtest/lib/build.gradle
index f791ac1..c02b29c 100644
--- a/tests/applibtest/lib/build.gradle
+++ b/tests/applibtest/lib/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'android-library'
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 
     defaultConfig {
         testPackageName = "com.android.tests.testprojecttest.testlib"
diff --git a/tests/assets/app/build.gradle b/tests/assets/app/build.gradle
index 02b03c3..5a77673 100644
--- a/tests/assets/app/build.gradle
+++ b/tests/assets/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'android'
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 }
 
 dependencies {
diff --git a/tests/assets/lib/build.gradle b/tests/assets/lib/build.gradle
index a06624d..4b2a733 100644
--- a/tests/assets/lib/build.gradle
+++ b/tests/assets/lib/build.gradle
@@ -2,5 +2,5 @@ apply plugin: 'android-library'
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 }
\ No newline at end of file
diff --git a/tests/attrOrder/app/build.gradle b/tests/attrOrder/app/build.gradle
index 5f58cac..98e423b 100644
--- a/tests/attrOrder/app/build.gradle
+++ b/tests/attrOrder/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'android'
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 }
 
 dependencies{
diff --git a/tests/attrOrder/lib/build.gradle b/tests/attrOrder/lib/build.gradle
index 9a02354..db660d9 100644
--- a/tests/attrOrder/lib/build.gradle
+++ b/tests/attrOrder/lib/build.gradle
@@ -2,6 +2,6 @@ apply plugin: 'android-library'
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 }
 
diff --git a/tests/basic/build.gradle b/tests/basic/build.gradle
index d5162af..38dcc52 100644
--- a/tests/basic/build.gradle
+++ b/tests/basic/build.gradle
@@ -21,7 +21,7 @@ dependencies {
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 
     testBuildType "debug"
 
diff --git a/tests/dependencies/build.gradle b/tests/dependencies/build.gradle
index 6a6735b..0f15c02 100644
--- a/tests/dependencies/build.gradle
+++ b/tests/dependencies/build.gradle
@@ -21,7 +21,7 @@ dependencies {
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 
     testBuildType "blah"
 
diff --git a/tests/dependencyChecker/build.gradle b/tests/dependencyChecker/build.gradle
index bb7b5aa..d591405 100644
--- a/tests/dependencyChecker/build.gradle
+++ b/tests/dependencyChecker/build.gradle
@@ -18,5 +18,5 @@ dependencies {
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 }
\ No newline at end of file
diff --git a/tests/flavored/build.gradle b/tests/flavored/build.gradle
index 8a4089e..edc6fa5 100644
--- a/tests/flavored/build.gradle
+++ b/tests/flavored/build.gradle
@@ -10,7 +10,7 @@ apply plugin: 'android'
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 
     testBuildType = "staging"
 
diff --git a/tests/flavorlib/app/build.gradle b/tests/flavorlib/app/build.gradle
index c6f7381..ce9946c 100644
--- a/tests/flavorlib/app/build.gradle
+++ b/tests/flavorlib/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'android'
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 
     productFlavors {
         flavor1 {
diff --git a/tests/flavorlib/lib1/build.gradle b/tests/flavorlib/lib1/build.gradle
index a06624d..4b2a733 100644
--- a/tests/flavorlib/lib1/build.gradle
+++ b/tests/flavorlib/lib1/build.gradle
@@ -2,5 +2,5 @@ apply plugin: 'android-library'
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 }
\ No newline at end of file
diff --git a/tests/flavorlib/lib2/build.gradle b/tests/flavorlib/lib2/build.gradle
index a06624d..4b2a733 100644
--- a/tests/flavorlib/lib2/build.gradle
+++ b/tests/flavorlib/lib2/build.gradle
@@ -2,5 +2,5 @@ apply plugin: 'android-library'
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 }
\ No newline at end of file
diff --git a/tests/flavorlibWithFailedTests/app/build.gradle b/tests/flavorlibWithFailedTests/app/build.gradle
index fa4f388..87e7230 100644
--- a/tests/flavorlibWithFailedTests/app/build.gradle
+++ b/tests/flavorlibWithFailedTests/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'android'
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 
     productFlavors {
         flavor1 {
diff --git a/tests/flavorlibWithFailedTests/lib1/build.gradle b/tests/flavorlibWithFailedTests/lib1/build.gradle
index a06624d..4b2a733 100644
--- a/tests/flavorlibWithFailedTests/lib1/build.gradle
+++ b/tests/flavorlibWithFailedTests/lib1/build.gradle
@@ -2,5 +2,5 @@ apply plugin: 'android-library'
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 }
\ No newline at end of file
diff --git a/tests/flavorlibWithFailedTests/lib2/build.gradle b/tests/flavorlibWithFailedTests/lib2/build.gradle
index a06624d..4b2a733 100644
--- a/tests/flavorlibWithFailedTests/lib2/build.gradle
+++ b/tests/flavorlibWithFailedTests/lib2/build.gradle
@@ -2,5 +2,5 @@ apply plugin: 'android-library'
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 }
\ No newline at end of file
diff --git a/tests/flavors/build.gradle b/tests/flavors/build.gradle
index 01bcd28..cd81f99 100644
--- a/tests/flavors/build.gradle
+++ b/tests/flavors/build.gradle
@@ -10,7 +10,7 @@ apply plugin: 'android'
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 
     flavorGroups   "group1", "group2"
 
diff --git a/tests/libTestDep/build.gradle b/tests/libTestDep/build.gradle
index 001edb0..0be14ae 100644
--- a/tests/libTestDep/build.gradle
+++ b/tests/libTestDep/build.gradle
@@ -19,5 +19,5 @@ dependencies {
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 }
\ No newline at end of file
diff --git a/tests/libsTest/app/build.gradle b/tests/libsTest/app/build.gradle
index d7028c0..7ca58b2 100644
--- a/tests/libsTest/app/build.gradle
+++ b/tests/libsTest/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'android'
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 }
 
 //
diff --git a/tests/libsTest/lib1/build.gradle b/tests/libsTest/lib1/build.gradle
index a0bc42b..8975f4b 100644
--- a/tests/libsTest/lib1/build.gradle
+++ b/tests/libsTest/lib1/build.gradle
@@ -6,7 +6,7 @@ dependencies {
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 
     defaultConfig {
         minSdkVersion 14
diff --git a/tests/libsTest/lib2/build.gradle b/tests/libsTest/lib2/build.gradle
index a06624d..4b2a733 100644
--- a/tests/libsTest/lib2/build.gradle
+++ b/tests/libsTest/lib2/build.gradle
@@ -2,5 +2,5 @@ apply plugin: 'android-library'
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 }
\ No newline at end of file
diff --git a/tests/libsTest/lib2b/build.gradle b/tests/libsTest/lib2b/build.gradle
index a06624d..4b2a733 100644
--- a/tests/libsTest/lib2b/build.gradle
+++ b/tests/libsTest/lib2b/build.gradle
@@ -2,5 +2,5 @@ apply plugin: 'android-library'
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 }
\ No newline at end of file
diff --git a/tests/libsTest/libapp/build.gradle b/tests/libsTest/libapp/build.gradle
index a06624d..4b2a733 100644
--- a/tests/libsTest/libapp/build.gradle
+++ b/tests/libsTest/libapp/build.gradle
@@ -2,5 +2,5 @@ apply plugin: 'android-library'
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 }
\ No newline at end of file
diff --git a/tests/localJars/app/build.gradle b/tests/localJars/app/build.gradle
index ebe6bc8..286d360 100644
--- a/tests/localJars/app/build.gradle
+++ b/tests/localJars/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'android'
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 }
 
 dependencies {
diff --git a/tests/localJars/baseLibrary/build.gradle b/tests/localJars/baseLibrary/build.gradle
index 03919d8..e8609b5 100644
--- a/tests/localJars/baseLibrary/build.gradle
+++ b/tests/localJars/baseLibrary/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'android-library'
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 }
 
 dependencies {
diff --git a/tests/localJars/library/build.gradle b/tests/localJars/library/build.gradle
index 4570429..979a308 100644
--- a/tests/localJars/library/build.gradle
+++ b/tests/localJars/library/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'android-library'
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 }
 
 dependencies {
diff --git a/tests/migrated/build.gradle b/tests/migrated/build.gradle
index 81a5599..37efffa 100644
--- a/tests/migrated/build.gradle
+++ b/tests/migrated/build.gradle
@@ -10,7 +10,7 @@ apply plugin: 'android'
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 
     sourceSets {
         main {
diff --git a/tests/multiproject/app/build.gradle b/tests/multiproject/app/build.gradle
index ebe6bc8..286d360 100644
--- a/tests/multiproject/app/build.gradle
+++ b/tests/multiproject/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'android'
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 }
 
 dependencies {
diff --git a/tests/multiproject/baseLibrary/build.gradle b/tests/multiproject/baseLibrary/build.gradle
index f866830..b746cd3 100644
--- a/tests/multiproject/baseLibrary/build.gradle
+++ b/tests/multiproject/baseLibrary/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'android-library'
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 }
 
 dependencies {
diff --git a/tests/multiproject/library/build.gradle b/tests/multiproject/library/build.gradle
index ddd4d72..4c62fe2 100644
--- a/tests/multiproject/library/build.gradle
+++ b/tests/multiproject/library/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'android-library'
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 }
 
 dependencies {
diff --git a/tests/multires/build.gradle b/tests/multires/build.gradle
index 7ee12bb..290e765 100644
--- a/tests/multires/build.gradle
+++ b/tests/multires/build.gradle
@@ -10,7 +10,7 @@ apply plugin: 'android'
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 
     sourceSets {
         main {
diff --git a/tests/overlay1/build.gradle b/tests/overlay1/build.gradle
index 9859273..c88c4c0 100644
--- a/tests/overlay1/build.gradle
+++ b/tests/overlay1/build.gradle
@@ -11,5 +11,5 @@ apply plugin: 'android'
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 }
\ No newline at end of file
diff --git a/tests/overlay2/build.gradle b/tests/overlay2/build.gradle
index 979c1a5..b3d7fcd 100644
--- a/tests/overlay2/build.gradle
+++ b/tests/overlay2/build.gradle
@@ -11,7 +11,7 @@ apply plugin: 'android'
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 
     productFlavors {
         one {}
diff --git a/tests/pkgOverride/build.gradle b/tests/pkgOverride/build.gradle
index 69db2d6..9b909a9 100644
--- a/tests/pkgOverride/build.gradle
+++ b/tests/pkgOverride/build.gradle
@@ -10,7 +10,7 @@ apply plugin: 'android'
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 
     defaultConfig {
         packageName "com.android.tests.basic.foo"
diff --git a/tests/proguard/build.gradle b/tests/proguard/build.gradle
index 5bc787f..394a039 100644
--- a/tests/proguard/build.gradle
+++ b/tests/proguard/build.gradle
@@ -10,7 +10,7 @@ apply plugin: 'android'
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 
     testBuildType "proguard"
 
diff --git a/tests/proguardLib/app/build.gradle b/tests/proguardLib/app/build.gradle
index 6b35651..2653d36 100644
--- a/tests/proguardLib/app/build.gradle
+++ b/tests/proguardLib/app/build.gradle
@@ -6,7 +6,7 @@ dependencies {
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 
     testBuildType "proguard"
 
diff --git a/tests/proguardLib/lib/build.gradle b/tests/proguardLib/lib/build.gradle
index 49f4759..3b209bf 100644
--- a/tests/proguardLib/lib/build.gradle
+++ b/tests/proguardLib/lib/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'android-library'
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 
     defaultConfig {
         versionCode 12
diff --git a/tests/renamedApk/build.gradle b/tests/renamedApk/build.gradle
index 45cfd45..5ff689c 100644
--- a/tests/renamedApk/build.gradle
+++ b/tests/renamedApk/build.gradle
@@ -14,7 +14,7 @@ repositories {
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 
     buildTypes.debug {
         zipAlign true
diff --git a/tests/renderscript/build.gradle b/tests/renderscript/build.gradle
index e270269..7530870 100644
--- a/tests/renderscript/build.gradle
+++ b/tests/renderscript/build.gradle
@@ -10,7 +10,7 @@ apply plugin: 'android'
 
 android {
     compileSdkVersion 17
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 
     defaultConfig {
         renderscriptTargetApi = 17
diff --git a/tests/renderscriptInLib/app/build.gradle b/tests/renderscriptInLib/app/build.gradle
index a630d71..c028ad5 100644
--- a/tests/renderscriptInLib/app/build.gradle
+++ b/tests/renderscriptInLib/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'android'
 
 android {
     compileSdkVersion 17
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 
     defaultConfig {
         renderscriptTargetApi = 11
diff --git a/tests/renderscriptInLib/lib/build.gradle b/tests/renderscriptInLib/lib/build.gradle
index 34bc777..1c875e4 100644
--- a/tests/renderscriptInLib/lib/build.gradle
+++ b/tests/renderscriptInLib/lib/build.gradle
@@ -2,5 +2,5 @@ apply plugin: 'android-library'
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 }
diff --git a/tests/renderscriptMultiSrc/build.gradle b/tests/renderscriptMultiSrc/build.gradle
index 448e203..e41f301 100644
--- a/tests/renderscriptMultiSrc/build.gradle
+++ b/tests/renderscriptMultiSrc/build.gradle
@@ -10,7 +10,7 @@ apply plugin: 'android'
 
 android {
     compileSdkVersion 17
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 
     defaultConfig {
         renderscriptTargetApi = 11
diff --git a/tests/repo/app/build.gradle b/tests/repo/app/build.gradle
index 5d6bbd8..b7d8e4a 100644
--- a/tests/repo/app/build.gradle
+++ b/tests/repo/app/build.gradle
@@ -21,6 +21,6 @@ dependencies {
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 }
 
diff --git a/tests/repo/baseLibrary/build.gradle b/tests/repo/baseLibrary/build.gradle
index de06880..ca226de 100644
--- a/tests/repo/baseLibrary/build.gradle
+++ b/tests/repo/baseLibrary/build.gradle
@@ -22,7 +22,7 @@ dependencies {
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 }
 
 group = 'com.example.android.multiproject'
diff --git a/tests/repo/library/build.gradle b/tests/repo/library/build.gradle
index d95b4c1..d2f6ae6 100644
--- a/tests/repo/library/build.gradle
+++ b/tests/repo/library/build.gradle
@@ -21,7 +21,7 @@ dependencies {
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 }
 
 group = 'com.example.android.multiproject'
diff --git a/tests/sameNamedLibs/app/build.gradle b/tests/sameNamedLibs/app/build.gradle
index ebc9714..ea8974b 100644
--- a/tests/sameNamedLibs/app/build.gradle
+++ b/tests/sameNamedLibs/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'android'
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 }
 
 //
diff --git a/tests/sameNamedLibs/lib1/libs/build.gradle b/tests/sameNamedLibs/lib1/libs/build.gradle
index bed93d7..32e056b 100644
--- a/tests/sameNamedLibs/lib1/libs/build.gradle
+++ b/tests/sameNamedLibs/lib1/libs/build.gradle
@@ -6,7 +6,7 @@ dependencies {
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 
     defaultConfig {
         minSdkVersion 14
diff --git a/tests/sameNamedLibs/lib2/libs/build.gradle b/tests/sameNamedLibs/lib2/libs/build.gradle
index a06624d..4b2a733 100644
--- a/tests/sameNamedLibs/lib2/libs/build.gradle
+++ b/tests/sameNamedLibs/lib2/libs/build.gradle
@@ -2,5 +2,5 @@ apply plugin: 'android-library'
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 }
\ No newline at end of file
diff --git a/tests/sameNamedLibs/lib2b/libs/build.gradle b/tests/sameNamedLibs/lib2b/libs/build.gradle
index a06624d..4b2a733 100644
--- a/tests/sameNamedLibs/lib2b/libs/build.gradle
+++ b/tests/sameNamedLibs/lib2b/libs/build.gradle
@@ -2,5 +2,5 @@ apply plugin: 'android-library'
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 }
\ No newline at end of file
diff --git a/tests/sameNamedLibs/libapp/libs/build.gradle b/tests/sameNamedLibs/libapp/libs/build.gradle
index a06624d..4b2a733 100644
--- a/tests/sameNamedLibs/libapp/libs/build.gradle
+++ b/tests/sameNamedLibs/libapp/libs/build.gradle
@@ -2,5 +2,5 @@ apply plugin: 'android-library'
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 }
\ No newline at end of file
diff --git a/tests/tictactoe/app/build.gradle b/tests/tictactoe/app/build.gradle
index 2981b70..376c388 100644
--- a/tests/tictactoe/app/build.gradle
+++ b/tests/tictactoe/app/build.gradle
@@ -6,5 +6,5 @@ dependencies {
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 }
diff --git a/tests/tictactoe/lib/build.gradle b/tests/tictactoe/lib/build.gradle
index a06624d..4b2a733 100644
--- a/tests/tictactoe/lib/build.gradle
+++ b/tests/tictactoe/lib/build.gradle
@@ -2,5 +2,5 @@ apply plugin: 'android-library'
 
 android {
     compileSdkVersion 15
-    buildToolsVersion "17.0"
+    buildToolsVersion "18.0.1"
 }
\ No newline at end of file