SDK support improvements.

Move figuring out the path to aidl/aapt/dx/llvm-rs-cc from IAndroidTarget
to SdkParser (in preparation of the build-tools).

Also change android.target to android.compileSdkVersion to make it
less confusing with regards to min/targetSdkVersion and also change it
to take either an int or a string.

Change-Id: I8642cb84f67cf75b49abe905b2a65f4d26668e98

37 files changed, 39 insertions, 43 deletions

diff --git a/tests/aidl/build.gradle b/tests/aidl/build.gradle
index dc42ba2..077f203 100644
--- a/tests/aidl/build.gradle
+++ b/tests/aidl/build.gradle
@@ -12,6 +12,6 @@ buildscript {
 apply plugin: 'android'
 
 android {
-    target = "android-15"
+    compileSdkVersion 15
 
 }
\ No newline at end of file
diff --git a/tests/api/app/build.gradle b/tests/api/app/build.gradle
index 6eb2be7..85e4c9d 100644
--- a/tests/api/app/build.gradle
+++ b/tests/api/app/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'android'
 
 android {
-    target "android-15"
+    compileSdkVersion 15
 }
 
 // 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 1045da6..50837f7 100644
--- a/tests/api/lib/build.gradle
+++ b/tests/api/lib/build.gradle
@@ -1,8 +1,7 @@
 apply plugin: 'android-library'
 
 android {
-    target = "android-15"
-
+    compileSdkVersion 15
 }
 
 // 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 abc0dbd..8d1c513 100644
--- a/tests/applibtest/app/build.gradle
+++ b/tests/applibtest/app/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'android'
 
 android {
-    target = "android-15"
+    compileSdkVersion 15
 }
 
 //
diff --git a/tests/applibtest/lib/build.gradle b/tests/applibtest/lib/build.gradle
index 5ca87af..99ff711 100644
--- a/tests/applibtest/lib/build.gradle
+++ b/tests/applibtest/lib/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'android-library'
 
 android {
-    target = "android-15"
+    compileSdkVersion 15
 
 	defaultConfig {
 		testPackageName = "com.android.tests.testprojecttest.testlib"
diff --git a/tests/basic/build.gradle b/tests/basic/build.gradle
index b8a8bd0..8f2f7cb 100644
--- a/tests/basic/build.gradle
+++ b/tests/basic/build.gradle
@@ -12,7 +12,7 @@ buildscript {
 apply plugin: 'android'
 
 android {
-    target "android-15"
+    compileSdkVersion 15
     testBuildType "debug"
 
     signingConfigs {
diff --git a/tests/dependencies/build.gradle b/tests/dependencies/build.gradle
index b7beef4..97076a4 100644
--- a/tests/dependencies/build.gradle
+++ b/tests/dependencies/build.gradle
@@ -22,7 +22,7 @@ dependencies {
 }
 
 android {
-    target "android-15"
+    compileSdkVersion 15
     testBuildType "blah"
 
     defaultConfig {
diff --git a/tests/flavored/build.gradle b/tests/flavored/build.gradle
index 7b6b01f..c5944c3 100644
--- a/tests/flavored/build.gradle
+++ b/tests/flavored/build.gradle
@@ -12,7 +12,7 @@ buildscript {
 apply plugin: 'android'
 
 android {
-    target = "android-15"
+    compileSdkVersion 15
     testBuildType = "staging"
 
     defaultConfig {
diff --git a/tests/flavorlib/app/build.gradle b/tests/flavorlib/app/build.gradle
index 6d3041a..c3111bf 100644
--- a/tests/flavorlib/app/build.gradle
+++ b/tests/flavorlib/app/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'android'
 
 android {
-    target = "android-15"
+    compileSdkVersion 15
 
     productFlavors {
         flavor1 {
diff --git a/tests/flavorlib/lib1/build.gradle b/tests/flavorlib/lib1/build.gradle
index f7838fb..182f845 100644
--- a/tests/flavorlib/lib1/build.gradle
+++ b/tests/flavorlib/lib1/build.gradle
@@ -1,5 +1,5 @@
 apply plugin: 'android-library'
 
 android {
-    target = "android-15"
+    compileSdkVersion 15
 }
\ No newline at end of file
diff --git a/tests/flavorlib/lib2/build.gradle b/tests/flavorlib/lib2/build.gradle
index f7838fb..182f845 100644
--- a/tests/flavorlib/lib2/build.gradle
+++ b/tests/flavorlib/lib2/build.gradle
@@ -1,5 +1,5 @@
 apply plugin: 'android-library'
 
 android {
-    target = "android-15"
+    compileSdkVersion 15
 }
\ No newline at end of file
diff --git a/tests/flavorlibWithFailedTests/app/build.gradle b/tests/flavorlibWithFailedTests/app/build.gradle
index dcaac3c..485c953 100644
--- a/tests/flavorlibWithFailedTests/app/build.gradle
+++ b/tests/flavorlibWithFailedTests/app/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'android'
 
 android {
-    target = "android-15"
+    compileSdkVersion 15
 
     productFlavors {
         flavor1 {
diff --git a/tests/flavorlibWithFailedTests/lib1/build.gradle b/tests/flavorlibWithFailedTests/lib1/build.gradle
index f7838fb..182f845 100644
--- a/tests/flavorlibWithFailedTests/lib1/build.gradle
+++ b/tests/flavorlibWithFailedTests/lib1/build.gradle
@@ -1,5 +1,5 @@
 apply plugin: 'android-library'
 
 android {
-    target = "android-15"
+    compileSdkVersion 15
 }
\ No newline at end of file
diff --git a/tests/flavorlibWithFailedTests/lib2/build.gradle b/tests/flavorlibWithFailedTests/lib2/build.gradle
index f7838fb..182f845 100644
--- a/tests/flavorlibWithFailedTests/lib2/build.gradle
+++ b/tests/flavorlibWithFailedTests/lib2/build.gradle
@@ -1,5 +1,5 @@
 apply plugin: 'android-library'
 
 android {
-    target = "android-15"
+    compileSdkVersion 15
 }
\ No newline at end of file
diff --git a/tests/flavors/build.gradle b/tests/flavors/build.gradle
index cc59029..d499442 100644
--- a/tests/flavors/build.gradle
+++ b/tests/flavors/build.gradle
@@ -9,7 +9,7 @@ buildscript {
 apply plugin: 'android'
 
 android {
-    target         "android-15"
+    compileSdkVersion 15
     flavorGroups   "group1", "group2"
 
     productFlavors {
diff --git a/tests/libsTest/app/build.gradle b/tests/libsTest/app/build.gradle
index eded7c2..2506b09 100644
--- a/tests/libsTest/app/build.gradle
+++ b/tests/libsTest/app/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'android'
 
 android {
-    target = "android-15"
+    compileSdkVersion 15
 }
 
 //
diff --git a/tests/libsTest/lib1/build.gradle b/tests/libsTest/lib1/build.gradle
index 3624c3b..f1e1e87 100644
--- a/tests/libsTest/lib1/build.gradle
+++ b/tests/libsTest/lib1/build.gradle
@@ -5,5 +5,5 @@ dependencies {
 }
 
 android {
-    target = "android-15"
+    compileSdkVersion 15
 }
\ No newline at end of file
diff --git a/tests/libsTest/lib2/build.gradle b/tests/libsTest/lib2/build.gradle
index a810790..182f845 100644
--- a/tests/libsTest/lib2/build.gradle
+++ b/tests/libsTest/lib2/build.gradle
@@ -1,6 +1,5 @@
 apply plugin: 'android-library'
 
 android {
-    target = "android-15"
-
+    compileSdkVersion 15
 }
\ No newline at end of file
diff --git a/tests/libsTest/lib2b/build.gradle b/tests/libsTest/lib2b/build.gradle
index a810790..182f845 100644
--- a/tests/libsTest/lib2b/build.gradle
+++ b/tests/libsTest/lib2b/build.gradle
@@ -1,6 +1,5 @@
 apply plugin: 'android-library'
 
 android {
-    target = "android-15"
-
+    compileSdkVersion 15
 }
\ No newline at end of file
diff --git a/tests/libsTest/libapp/build.gradle b/tests/libsTest/libapp/build.gradle
index a810790..182f845 100644
--- a/tests/libsTest/libapp/build.gradle
+++ b/tests/libsTest/libapp/build.gradle
@@ -1,6 +1,5 @@
 apply plugin: 'android-library'
 
 android {
-    target = "android-15"
-
+    compileSdkVersion 15
 }
\ No newline at end of file
diff --git a/tests/migrated/build.gradle b/tests/migrated/build.gradle
index fd8ca17..fa7cbfd 100644
--- a/tests/migrated/build.gradle
+++ b/tests/migrated/build.gradle
@@ -12,7 +12,7 @@ buildscript {
 apply plugin: 'android'
 
 android {
-    target = "android-15"
+    compileSdkVersion 15
 
     sourceSets {
         main {
diff --git a/tests/multiproject/app/build.gradle b/tests/multiproject/app/build.gradle
index a8af53e..11f65ff 100644
--- a/tests/multiproject/app/build.gradle
+++ b/tests/multiproject/app/build.gradle
@@ -5,7 +5,7 @@
 apply plugin: 'android'
 
 android {
-    target 'android-15'
+    compileSdkVersion 15
 }
 
 dependencies {
diff --git a/tests/multiproject/baseLibrary/build.gradle b/tests/multiproject/baseLibrary/build.gradle
index f05d025..6c5b6a5 100644
--- a/tests/multiproject/baseLibrary/build.gradle
+++ b/tests/multiproject/baseLibrary/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'android-library'
 
 android {
-    target 'android-15'
+    compileSdkVersion 15
 }
 
 dependencies {
diff --git a/tests/multiproject/library/build.gradle b/tests/multiproject/library/build.gradle
index a5f742c..bcce608 100644
--- a/tests/multiproject/library/build.gradle
+++ b/tests/multiproject/library/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'android-library'
 
 android {
-    target 'android-15'
+    compileSdkVersion 15
 }
 
 dependencies {
diff --git a/tests/multires/build.gradle b/tests/multires/build.gradle
index a54bbbf..7353f59 100644
--- a/tests/multires/build.gradle
+++ b/tests/multires/build.gradle
@@ -9,7 +9,7 @@ buildscript {
 apply plugin: 'android'
 
 android {
-    target "android-15"
+    compileSdkVersion 15
 
     sourceSets {
         main {
diff --git a/tests/overlay1/build.gradle b/tests/overlay1/build.gradle
index 8601ef1..60b8d4f 100644
--- a/tests/overlay1/build.gradle
+++ b/tests/overlay1/build.gradle
@@ -10,5 +10,5 @@ buildscript {
 apply plugin: 'android'
 
 android {
-    target "android-15"
+    compileSdkVersion 15
 }
\ No newline at end of file
diff --git a/tests/overlay2/build.gradle b/tests/overlay2/build.gradle
index e08ca60..3ec6b79 100644
--- a/tests/overlay2/build.gradle
+++ b/tests/overlay2/build.gradle
@@ -10,7 +10,7 @@ buildscript {
 apply plugin: 'android'
 
 android {
-    target "android-15"
+    compileSdkVersion 15
 
     productFlavors {
         one {}
diff --git a/tests/renderscript/build.gradle b/tests/renderscript/build.gradle
index 1a92390..820afb8 100644
--- a/tests/renderscript/build.gradle
+++ b/tests/renderscript/build.gradle
@@ -12,7 +12,7 @@ buildscript {
 apply plugin: 'android'
 
 android {
-    target "android-17"
+    compileSdkVersion 17
 
     defaultConfig {
         renderscriptTargetApi = 17
diff --git a/tests/renderscriptInLib/app/build.gradle b/tests/renderscriptInLib/app/build.gradle
index f04e302..982c831 100644
--- a/tests/renderscriptInLib/app/build.gradle
+++ b/tests/renderscriptInLib/app/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'android'
 
 android {
-    target "android-17"
+    compileSdkVersion 17
 
     defaultConfig {
         renderscriptTargetApi = 11
diff --git a/tests/renderscriptInLib/lib/build.gradle b/tests/renderscriptInLib/lib/build.gradle
index b7ce7ab..7b79c44 100644
--- a/tests/renderscriptInLib/lib/build.gradle
+++ b/tests/renderscriptInLib/lib/build.gradle
@@ -1,5 +1,5 @@
 apply plugin: 'android-library'
 
 android {
-    target 'android-15'
+    compileSdkVersion 15
 }
diff --git a/tests/renderscriptMultiSrc/build.gradle b/tests/renderscriptMultiSrc/build.gradle
index 13825b4..d947c94 100644
--- a/tests/renderscriptMultiSrc/build.gradle
+++ b/tests/renderscriptMultiSrc/build.gradle
@@ -12,7 +12,7 @@ buildscript {
 apply plugin: 'android'
 
 android {
-    target "android-17"
+    compileSdkVersion 17
 
     defaultConfig {
         renderscriptTargetApi = 11
diff --git a/tests/repo/app/build.gradle b/tests/repo/app/build.gradle
index 2c0db45..bf2e2fb 100644
--- a/tests/repo/app/build.gradle
+++ b/tests/repo/app/build.gradle
@@ -19,6 +19,6 @@ dependencies {
 }
 
 android {
-    target 'android-15'
+    compileSdkVersion 15
 }
 
diff --git a/tests/repo/app/src/main/java/com/example/android/multiproject/MainActivity.java b/tests/repo/app/src/main/java/com/example/android/multiproject/MainActivity.java
index 60dd603..6a8b95b 100644
--- a/tests/repo/app/src/main/java/com/example/android/multiproject/MainActivity.java
+++ b/tests/repo/app/src/main/java/com/example/android/multiproject/MainActivity.java
@@ -18,9 +18,9 @@ public class MainActivity extends Activity {
         setContentView(R.layout.main);
 
         // some random code to test dependencies on util and guava
-       Person p = new Person("foo");
-       List<Person> persons = Lists.newArrayList();
-       persons.add(p);
+        Person p = new Person("foo");
+        List<Person> persons = Lists.newArrayList();
+        persons.add(p);
     }
 
     public void sendMessage(View view) {
diff --git a/tests/repo/baseLibrary/build.gradle b/tests/repo/baseLibrary/build.gradle
index 89445f9..9ae0271 100644
--- a/tests/repo/baseLibrary/build.gradle
+++ b/tests/repo/baseLibrary/build.gradle
@@ -20,7 +20,7 @@ dependencies {
 }
 
 android {
-    target 'android-15'
+    compileSdkVersion 15
 }
 
 group = 'com.example.android.multiproject'
diff --git a/tests/repo/library/build.gradle b/tests/repo/library/build.gradle
index 90ed7b6..84c8d6f 100644
--- a/tests/repo/library/build.gradle
+++ b/tests/repo/library/build.gradle
@@ -19,7 +19,7 @@ dependencies {
 }
 
 android {
-    target 'android-15'
+    compileSdkVersion 15
 }
 
 group = 'com.example.android.multiproject'
diff --git a/tests/tictactoe/app/build.gradle b/tests/tictactoe/app/build.gradle
index 3d4a6f5..dfb03f0 100644
--- a/tests/tictactoe/app/build.gradle
+++ b/tests/tictactoe/app/build.gradle
@@ -8,5 +8,5 @@ dependencies {
 }
 
 android {
-    target = "android-15"
+    compileSdkVersion 15
 }
diff --git a/tests/tictactoe/lib/build.gradle b/tests/tictactoe/lib/build.gradle
index f7838fb..182f845 100644
--- a/tests/tictactoe/lib/build.gradle
+++ b/tests/tictactoe/lib/build.gradle
@@ -1,5 +1,5 @@
 apply plugin: 'android-library'
 
 android {
-    target = "android-15"
+    compileSdkVersion 15
 }
\ No newline at end of file