From e0b73fdd1c4f5d35bb59ad8408fdfcde6428ca56 Mon Sep 17 00:00:00 2001
From: Lyubo Marinov <lmarinov@atlassian.com>
Date: Tue, 3 Oct 2017 20:44:49 -0500
Subject: [PATCH] [Android] Fix Android Studio 3.0 Beta 7

---
 android/app/build.gradle |  1 -
 android/build.gradle     | 12 +++++++-----
 android/sdk/build.gradle |  1 -
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 893984a54..d39edca60 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
         applicationId 'org.jitsi.meet'
diff --git a/android/build.gradle b/android/build.gradle
index c56951b5f..2bde0480c 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         maven { url 'https://maven.google.com' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-beta6'
+        classpath 'com.android.tools.build:gradle:3.0.0-beta7'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files.
@@ -58,7 +58,9 @@ allprojects {
 
             project.android {
                 compileSdkVersion rootProject.ext.compileSdkVersion
-                buildToolsVersion rootProject.ext.buildToolsVersion
+                if (rootProject.ext.has('buildToolsVersion')) {
+                    buildToolsVersion rootProject.ext.buildToolsVersion
+                }
                 defaultConfig {
                     minSdkVersion rootProject.ext.minSdkVersion
                     targetSdkVersion rootProject.ext.targetSdkVersion
@@ -129,7 +131,6 @@ allprojects {
 
 ext {
     compileSdkVersion = 25
-    buildToolsVersion = "25.0.3"
     minSdkVersion    = 16
     targetSdkVersion = 25
 
@@ -145,8 +146,9 @@ ext {
 // modules that we utilize such as react-native-background-timer.
 subprojects { subproject ->
     afterEvaluate{
-        if (subproject.plugins.hasPlugin('android')
-                || subproject.plugins.hasPlugin('android-library')) {
+        if ((subproject.plugins.hasPlugin('android')
+                    || subproject.plugins.hasPlugin('android-library'))
+                && rootProject.ext.has('buildToolsVersion')) {
             android {
                 buildToolsVersion rootProject.ext.buildToolsVersion
             }
diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle
index 5c7a12b33..e250c9db5 100644
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@ -3,7 +3,6 @@ apply plugin: 'maven-publish'
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion