commit 6ab64e0f127d50eab891a54b3df8ff880d497bf4
author Nicole Borrelli <borrelli@google.com> Wed Feb 15 18:23:51 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Feb 15 18:23:51 2017 +0000
tree 8ded3d8e3b22cd412698a0c87d843f83edd65773
parent 38ff69ce53871f9666280b5ba305fcecb19b5b4a
parent 3860bcee06ed9786b69542a4b873c7bcc6b49c11

Merge "Add ability to use support library for vector drawables" into nyc-mr1-dev am: f2d0581939
am: 3860bcee06

Change-Id: Idfcefc99ef3c0a9b91d50028fca335665142626a

templates/base-application/_MODULE_/build.gradle.ftl

diff --git a/templates/base-application/_MODULE_/build.gradle.ftl b/templates/base-application/_MODULE_/build.gradle.ftl
index 11ce3bc..cb0a5c4 100644
--- a/templates/base-application/_MODULE_/build.gradle.ftl
+++ b/templates/base-application/_MODULE_/build.gradle.ftl
@@ -37,15 +37,15 @@
 
 <#if !sample.auto_add_support_lib?has_content || sample.auto_add_support_lib == "true">
   <#if sample.minSdk?matches(r'^\d+$') && sample.minSdk?number < 7>
-    compile "com.android.support:support-v4:25.0.1"
+    compile "com.android.support:support-v4:25.1.1"
   <#elseif sample.minSdk?matches(r'^\d+$') && sample.minSdk?number < 13>
-    compile "com.android.support:support-v4:25.0.1"
-    compile "com.android.support:gridlayout-v7:25.0.1"
-    compile "com.android.support:cardview-v7:25.0.1"
+    compile "com.android.support:support-v4:25.1.1"
+    compile "com.android.support:gridlayout-v7:25.1.1"
+    compile "com.android.support:cardview-v7:25.1.1"
   <#else>
-    compile "com.android.support:support-v4:25.0.1"
-    compile "com.android.support:support-v13:25.0.1"
-    compile "com.android.support:cardview-v7:25.0.1"
+    compile "com.android.support:support-v4:25.1.1"
+    compile "com.android.support:support-v13:25.1.1"
+    compile "com.android.support:cardview-v7:25.1.1"
   </#if>
 </#if>
 
@@ -76,6 +76,10 @@
     defaultConfig {
         minSdkVersion ${min_sdk}
         targetSdkVersion ${compile_sdk}
+
+<#if sample.use_support_library_vector_drawables?has_content && sample.use_support_library_vector_drawables == "true">
+        vectorDrawables.useSupportLibrary = true
+</#if>
     }
 
     compileOptions {

templates/include/common.ftl

diff --git a/templates/include/common.ftl b/templates/include/common.ftl
index 7e2c6e6..57fc0a2 100644
--- a/templates/include/common.ftl
+++ b/templates/include/common.ftl
@@ -83,7 +83,7 @@
 <#assign play_services_version="10.0.1"/>
 <#assign play_services_wearable_dependency="'com.google.android.gms:play-services-wearable:${play_services_version}'"/>
 
-<#assign android_support_v13_dependency="'com.android.support:support-v13:25.0.1'"/>
+<#assign android_support_v13_dependency="'com.android.support:support-v13:25.1.1'"/>
 
 <#assign wearable_support_dependency="'com.google.android.support:wearable:2.0.0'"/>