DO NOT MERGE. Move to using prebuilts/fullsdk instead of prebuilts/sdk
Relanding this since ag/1642243 has landed.
Change-Id: I200a0b26b2e0cefbfbc7512c02f7755c516b4c38
Test: compiles both from terminal using gradlew and from android studio
diff --git a/.gitignore b/.gitignore
index 6c671f7..a59f7e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
.project
.settings/
project.properties
+local.properties
**/bin
**/gen
*.iml
diff --git a/build.gradle b/build.gradle
index 845c801..b67729e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,7 @@
import android.support.doclava.DoclavaMultilineJavadocOptionFileOption
import com.android.build.gradle.internal.coverage.JacocoReportTask
import com.android.build.gradle.internal.tasks.DeviceProviderInstrumentTestTask
+import org.gradle.internal.os.OperatingSystem
import android.support.checkapi.CheckApiTask
import android.support.checkapi.UpdateApiTask
@@ -31,7 +32,7 @@
doclava project(':doclava')
}
-gradle.ext.currentSdk = 'current'
+gradle.ext.currentSdk = 25
ext.supportVersion = '25.1.0-SNAPSHOT'
ext.extraVersion = 40
ext.supportRepoOut = ''
@@ -45,6 +46,11 @@
// required for the doclava dependency.
ext.usePrebuilts = "true"
+// Use the embedded SDK by default, which can be overridden by setting the 'sdk.dir' property
+// (e.g. local.properties) or the 'ANDROID_HOME' environment variable.
+final String platform = OperatingSystem.current().isMacOsX() ? 'darwin' : 'linux'
+System.setProperty('android.home', "${rootDir}/../../prebuilts/fullsdk-${platform}")
+
/*
* With the build server you are given two env variables.
* The OUT_DIR is a temporary directory you can use to put things during the build.
diff --git a/local.properties b/local.properties
deleted file mode 100644
index 7b7f7a0..0000000
--- a/local.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-## This file is automatically generated by Android Studio.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must *NOT* be checked into Version Control Systems,
-# as it contains information specific to your local configuration.
-#
-# Location of the SDK. This is only used by Gradle.
-# For customization when using a Version Control System, please read the
-# header note.
-#Mon Apr 11 17:16:19 PDT 2016
-#do not define sdk.dir here, it will confuse android studio
-android.dir=../../