From 98590d2934a6dfa149188e039ebdcc3e3adef825 Mon Sep 17 00:00:00 2001
From: Stan Iliev <stani@google.com>
Date: Thu, 4 Oct 2018 11:20:59 -0400
Subject: [PATCH] Update android apps to latest android plugin

NDK depricated mips toolchain, which is causing a build error,
because old android gradle plugin is looking for it.
Updating to latest plugin is fixing the build issue.

Test: Built skottie demo app from command line and Android Studio
Bug: skia:
Change-Id: I0071bf996c44f96969079cb680cb05ec38efdc93
Reviewed-on: https://skia-review.googlesource.com/c/159581
Reviewed-by: Heather Miller <hcm@google.com>
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Stan Iliev <stani@google.com>
---
 platform_tools/android/apps/build.gradle                      | 2 +-
 .../android/apps/gradle/wrapper/gradle-wrapper.properties     | 4 ++--
 platform_tools/android/apps/skqp/build.gradle                 | 4 ++--
 platform_tools/android/apps/viewer/build.gradle               | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/platform_tools/android/apps/build.gradle b/platform_tools/android/apps/build.gradle
index 64e730897f..e894ae5c37 100644
--- a/platform_tools/android/apps/build.gradle
+++ b/platform_tools/android/apps/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.2.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/platform_tools/android/apps/gradle/wrapper/gradle-wrapper.properties b/platform_tools/android/apps/gradle/wrapper/gradle-wrapper.properties
index 68afb72efc..9a8e388de9 100644
--- a/platform_tools/android/apps/gradle/wrapper/gradle-wrapper.properties
+++ b/platform_tools/android/apps/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Dec 02 09:57:59 EST 2016
+#Thu Oct 04 10:41:31 EDT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
\ No newline at end of file
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/platform_tools/android/apps/skqp/build.gradle b/platform_tools/android/apps/skqp/build.gradle
index 2c54751b3a..fa2c106cc6 100644
--- a/platform_tools/android/apps/skqp/build.gradle
+++ b/platform_tools/android/apps/skqp/build.gradle
@@ -7,8 +7,8 @@
 apply plugin: 'com.android.application'
 
 dependencies {
-    compile 'com.android.support:design:26.+'
-    compile 'com.android.support.test:runner:0.5'
+    implementation 'com.android.support:design:26.+'
+    implementation 'com.android.support.test:runner:0.5'
 }
 
 android {
diff --git a/platform_tools/android/apps/viewer/build.gradle b/platform_tools/android/apps/viewer/build.gradle
index 6ec51c857d..e407f70657 100644
--- a/platform_tools/android/apps/viewer/build.gradle
+++ b/platform_tools/android/apps/viewer/build.gradle
@@ -7,8 +7,8 @@
 apply plugin: 'com.android.application'
 
 dependencies {
-    compile 'com.android.support:support-v13:23.3.0'
-    compile 'com.android.support:appcompat-v7:23.3.0'
+    implementation 'com.android.support:support-v13:23.3.0'
+    implementation 'com.android.support:appcompat-v7:23.3.0'
 }
 
 android {