Snap for 5234907 from 57901cbfa1e30d6cc1bd57a3d1f9cbe670fd6227 to pi-b4s4-releaseandroid-9.0.0_r39android-9.0.0_r38pie-b4s4-release

Change-Id: Ifd20ca20dcc6868d074d240f3512b0d45bbf85d8

7 files changed, 11 insertions, 17 deletions

diff --git a/build.gradle b/build.gradle
index 04a6c768..29fca279 100644
--- a/build.gradle
+++ b/build.gradle
@@ -24,11 +24,6 @@ task preflight {
     project.afterEvaluate({preflight.dependsOn(project.refresh)})
 }
 
-task wrapper(type: Wrapper) {
-    gradleVersion = '2.10'
-}
-
-
 String outPath(String buildType) {
 /*
     def repoInfo = "repo info platform/developers/build".execute().text
diff --git a/templates/base-build/README.md.ftl b/templates/base-build/README.md.ftl
index a283da27..213eb4b0 100644
--- a/templates/base-build/README.md.ftl
+++ b/templates/base-build/README.md.ftl
@@ -49,7 +49,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de
 License
 -------
 
-Copyright 2017 The Android Open Source Project, Inc.
+Copyright 2019 The Android Open Source Project, Inc.
 
 Licensed to the Apache Software Foundation (ASF) under one or more contributor
 license agreements.  See the NOTICE file distributed with this work for
diff --git a/templates/base/README.md.ftl b/templates/base/README.md.ftl
index a283da27..213eb4b0 100644
--- a/templates/base/README.md.ftl
+++ b/templates/base/README.md.ftl
@@ -49,7 +49,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de
 License
 -------
 
-Copyright 2017 The Android Open Source Project, Inc.
+Copyright 2019 The Android Open Source Project, Inc.
 
 Licensed to the Apache Software Foundation (ASF) under one or more contributor
 license agreements.  See the NOTICE file distributed with this work for
diff --git a/templates/base/_MODULE_/build.gradle.ftl b/templates/base/_MODULE_/build.gradle.ftl
index 22c50905..a784d20d 100644
--- a/templates/base/_MODULE_/build.gradle.ftl
+++ b/templates/base/_MODULE_/build.gradle.ftl
@@ -70,6 +70,10 @@ dependencies {
     implementation files(${dep})
 </#list>
 
+<#list sample.annotationProcessor as ap>
+    annotationProcessor "${ap}"
+</#list>
+
 <#if sample.wearable.has_handheld_app?has_content && sample.wearable.has_handheld_app?lower_case == "true">
     implementation ${play_services_wearable_dependency}
 
@@ -100,8 +104,6 @@ android {
     compileSdkVersion ${compile_sdk}
   </#if>
 
-    buildToolsVersion ${build_tools_version}
-
     defaultConfig {
         minSdkVersion ${min_sdk}
       <#if sample.targetSdkVersion?? && sample.targetSdkVersion?has_content>
@@ -109,6 +111,9 @@ android {
       <#else>
         targetSdkVersion ${compile_sdk}
       </#if>
+<#if sample.defaultConfig?has_content>
+        ${sample.defaultConfig}
+<#else>
     }
 
     compileOptions {
@@ -128,11 +133,6 @@ android {
         androidTest.setRoot('tests')
         androidTest.java.srcDirs = ['tests/src']
 
-<#if sample.defaultConfig?has_content>
-        defaultConfig {
-        ${sample.defaultConfig}
-        }
-<#else>
 </#if>
     }
 
diff --git a/templates/create/_MODULE_/build.gradle.ftl b/templates/create/_MODULE_/build.gradle.ftl
index 479d7da1..2dfcded1 100644
--- a/templates/create/_MODULE_/build.gradle.ftl
+++ b/templates/create/_MODULE_/build.gradle.ftl
@@ -37,7 +37,6 @@ android {
      <#-- Note that target SDK is hardcoded in this template. We expect all samples
           to always use the most current SDK as their target. -->
     compileSdkVersion ${compile_sdk}
-    buildToolsVersion ${build_tools_version}
 }
 
 task preflight (dependsOn: parent.preflight) {
diff --git a/templates/include/common.ftl b/templates/include/common.ftl
index bfa9cfda..cc306dab 100644
--- a/templates/include/common.ftl
+++ b/templates/include/common.ftl
@@ -78,7 +78,7 @@
 </#macro>
 
 <#-- Set the global build tools version -->
-<#assign build_tools_version='"27.0.3"'/>
+<#assign build_tools_version='"28.0.3"'/>
 
 <#assign play_services_version="15.0.1"/>
 <#assign play_services_wearable_dependency="'com.google.android.gms:play-services-wearable:${play_services_version}'"/>
diff --git a/templates/unmanaged/README.md.ftl b/templates/unmanaged/README.md.ftl
index fb495341..da28fc9c 100644
--- a/templates/unmanaged/README.md.ftl
+++ b/templates/unmanaged/README.md.ftl
@@ -48,7 +48,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de
 License
 -------
 
-Copyright 2017 The Android Open Source Project, Inc.
+Copyright 2019 The Android Open Source Project, Inc.
 
 Licensed to the Apache Software Foundation (ASF) under one or more contributor
 license agreements.  See the NOTICE file distributed with this work for