diff options
| author | Trevor Johns <trevorjohns@google.com> | 2016-06-15 09:52:40 -0700 |
|---|---|---|
| committer | Trevor Johns <trevorjohns@google.com> | 2016-06-15 11:07:40 -0700 |
| commit | f9872ded3bb6cd3c01ab0881a58764f5171b4c64 (patch) | |
| tree | 5ca5d897923d5518da3cee6145e821e5cc532277 /ui/window | |
| parent | 55a4a8d0bb1c9a6fb80c6a35416cfc2f22e2bba7 (diff) | |
| download | android-f9872ded3bb6cd3c01ab0881a58764f5171b4c64.tar.gz | |
samples: Use API 23 by default, except for N-specific samples.
Since N is still in DP4, but we're building docs from nyc-dev now,
adjust build so that most samples are built using flags for API 23.
N-specific samples have overrides added in template-params.xml.
Also adjusted build tools version to 23.0.3. (I thought I'd done this
earlier.)
Change-Id: Ic3cde8d144b92b16fc24e1e49fd3bdda2c198429
Diffstat (limited to 'ui/window')
| -rw-r--r-- | ui/window/MultiWindowPlayground/Application/build.gradle | 4 | ||||
| -rw-r--r-- | ui/window/MultiWindowPlayground/template-params.xml | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ui/window/MultiWindowPlayground/Application/build.gradle b/ui/window/MultiWindowPlayground/Application/build.gradle index e482720f..9d6d0b8e 100644 --- a/ui/window/MultiWindowPlayground/Application/build.gradle +++ b/ui/window/MultiWindowPlayground/Application/build.gradle @@ -33,8 +33,8 @@ allprojects { apply plugin: 'com.android.application' android { - compileSdkVersion 'android-N' - buildToolsVersion '24.0.0 rc1' + compileSdkVersion '24' + buildToolsVersion '23.0.3' defaultConfig { applicationId "com.android.multiwindowplayground" diff --git a/ui/window/MultiWindowPlayground/template-params.xml b/ui/window/MultiWindowPlayground/template-params.xml index 3d78da6b..3c85054b 100644 --- a/ui/window/MultiWindowPlayground/template-params.xml +++ b/ui/window/MultiWindowPlayground/template-params.xml @@ -20,9 +20,9 @@ <group>Android N Preview</group> <package>com.example.android.multiwindowplayground</package> - <minSdk>"N"</minSdk> - <targetSdkVersion>"N"</targetSdkVersion> - <compileSdkVersion>"android-N"</compileSdkVersion> + <minSdk>24</minSdk> + <compileSdkVersion>24</compileSdkVersion> + <targetSdkVersion>24</targetSdkVersion> <strings> <intro> |