From 5f42852bf0e5e8c500e3b29e5c836dbde02671b7 Mon Sep 17 00:00:00 2001
From: Stephan Bertram <stephan.bertram@sport1.de>
Date: Thu, 1 Aug 2019 16:40:35 +0200
Subject: [PATCH 1/2] feat: optimize grdale code generation

---
 packages/platform-android/native_modules.gradle | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/platform-android/native_modules.gradle b/packages/platform-android/native_modules.gradle
index 4e3983a09..b5bdf81eb 100644
--- a/packages/platform-android/native_modules.gradle
+++ b/packages/platform-android/native_modules.gradle
@@ -2,8 +2,9 @@ import groovy.json.JsonSlurper
 import org.gradle.initialization.DefaultSettings
 
 def generatedFileName = "PackageList.java"
+def generatedFilePackage = "com.facebook.react"
 def generatedFileContentsTemplate = """
-package com.facebook.react;
+package $generatedFilePackage;
 
 import android.app.Application;
 import android.content.Context;
@@ -229,8 +230,8 @@ ext.applyNativeModulesSettingsGradle = { DefaultSettings defaultSettings, String
 ext.applyNativeModulesAppBuildGradle = { Project project, String root = ".." ->
   autoModules.applyBuildGradle(project, root)
 
-  def generatedSrcDir = "generated/rncli/src/main/java"
-  def generatedCodeDir = new File(buildDir, "$generatedSrcDir/com/facebook/react")
+  def generatedSrcDir = new File(buildDir, "generated/rncli/src/main/java/")
+  def generatedCodeDir = new File(generatedSrcDir, generatedFilePackage.replace('.', '/'))
 
   task generatePackageList {
     doLast {
@@ -244,7 +245,7 @@ ext.applyNativeModulesAppBuildGradle = { Project project, String root = ".." ->
     sourceSets {
       main {
         java {
-          srcDirs += "build/$generatedSrcDir"
+          srcDirs += generatedSrcDir
         }
       }
     }

From 018a91c9b0b021baba378917ca8683102480821c Mon Sep 17 00:00:00 2001
From: Stephan Bertram <stephan.bertram@sport1.de>
Date: Thu, 1 Aug 2019 16:58:16 +0200
Subject: [PATCH 2/2] remove trailing slash

---
 packages/platform-android/native_modules.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/platform-android/native_modules.gradle b/packages/platform-android/native_modules.gradle
index b5bdf81eb..30ddaf1e4 100644
--- a/packages/platform-android/native_modules.gradle
+++ b/packages/platform-android/native_modules.gradle
@@ -230,7 +230,7 @@ ext.applyNativeModulesSettingsGradle = { DefaultSettings defaultSettings, String
 ext.applyNativeModulesAppBuildGradle = { Project project, String root = ".." ->
   autoModules.applyBuildGradle(project, root)
 
-  def generatedSrcDir = new File(buildDir, "generated/rncli/src/main/java/")
+  def generatedSrcDir = new File(buildDir, "generated/rncli/src/main/java")
   def generatedCodeDir = new File(generatedSrcDir, generatedFilePackage.replace('.', '/'))
 
   task generatePackageList {