From 184108f99bb8c39fbbf4d4fa363033773111fcd8 Mon Sep 17 00:00:00 2001
From: Dulmandakh <dulmandakh@gmail.com>
Date: Sat, 27 Apr 2019 09:39:35 -0700
Subject: [PATCH] bump android gradle plugin to 3.4.0 (#24463)

Summary:
This PR bumps Android Gradle Plugin to 3.4.0, which enables R8 shrinker by default and improves build performance significantly.

Disabled R8 for ReactAndroid because it'll strip out AndroidX and other libraries bundled in ReactAndroid.

[Android] [Changed] - bump Android Gradle plugin to 3.4.0
Pull Request resolved: https://github.com/facebook/react-native/pull/24463

Differential Revision: D15107117

Pulled By: hramos

fbshipit-source-id: 35a03dc9955e889c9399faeaf9a862e0fc044fc4

# Conflicts:
#	ReactAndroid/gradle.properties
#	build.gradle
#	template/android/build.gradle
---
 ReactAndroid/gradle.properties | 2 ++
 build.gradle                   | 2 +-
 react.gradle                   | 5 +++++
 template/android/build.gradle  | 2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ReactAndroid/gradle.properties b/ReactAndroid/gradle.properties
index 80fecfbd7da687..f99a8aa64dfbdf 100644
--- a/ReactAndroid/gradle.properties
+++ b/ReactAndroid/gradle.properties
@@ -21,3 +21,5 @@ DOUBLE_CONVERSION_VERSION=1.1.6
 FOLLY_VERSION=2018.10.22.00
 GLOG_VERSION=0.3.5
 JSC_VERSION=236355.1.1
+
+android.enableR8=false
diff --git a/build.gradle b/build.gradle
index 080a3bb288f9b5..57e76847d272c4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:3.3.0")
+        classpath("com.android.tools.build:gradle:3.4.0")
         classpath("de.undercouch:gradle-download-task:3.4.3")
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/react.gradle b/react.gradle
index 4ead2b6b5d1773..f10a00bc9e181e 100644
--- a/react.gradle
+++ b/react.gradle
@@ -146,6 +146,11 @@ afterEvaluate {
                 into ("merged_assets/${variant.name}/merge${targetName}Assets/out") {
                     from(jsBundleDir)
                 }
+
+                // Workaround for Android Gradle Plugin 3.4+ new asset directory
+                into ("merged_assets/${variant.name}/out") {
+                    from(jsBundleDir)
+                }
             }
 
             // mergeAssets must run first, as it clears the intermediates directory
diff --git a/template/android/build.gradle b/template/android/build.gradle
index d3890937609044..3a1d305e5ba13e 100644
--- a/template/android/build.gradle
+++ b/template/android/build.gradle
@@ -13,7 +13,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath("com.android.tools.build:gradle:3.4.0")
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files