From 97d6d724e1b7463b91c41a1a243b9ebb49b47a06 Mon Sep 17 00:00:00 2001 From: Nicola Corti Date: Thu, 25 Jan 2024 10:58:00 -0800 Subject: [PATCH] Cleanup srcSet for java and res (#42659) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/42659 Those folders for Java don't exist anymore, I'm removing this as it's unnecessary and will default to only src/main/java. For resources instead, I'm using `setSrcDirs` as it will replace the default, while `srcDirs()` will add those folders. We need to replace the default res folder as we need to follow the resource folder structure of BUCK Changelog: [Internal] [Changed] - Cleanup srcSet for java and res Reviewed By: cipolleschi Differential Revision: D53083677 fbshipit-source-id: 4dc42c700ea5446bbd49c63fc43b58ba316f4944 --- packages/react-native/ReactAndroid/build.gradle.kts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/packages/react-native/ReactAndroid/build.gradle.kts b/packages/react-native/ReactAndroid/build.gradle.kts index e205d965f7a..9365583ce63 100644 --- a/packages/react-native/ReactAndroid/build.gradle.kts +++ b/packages/react-native/ReactAndroid/build.gradle.kts @@ -593,17 +593,12 @@ android { ":packages:react-native:ReactAndroid:hermes-engine:preBuild") sourceSets.getByName("main") { - res.srcDirs( + res.setSrcDirs( listOf( "src/main/res/devsupport", "src/main/res/shell", "src/main/res/views/modal", "src/main/res/views/uimanager")) - java.srcDirs( - listOf( - "src/main/java", - "src/main/libraries/soloader/java", - "src/main/jni/first-party/fb/jni/java")) java.exclude("com/facebook/annotationprocessors") java.exclude("com/facebook/react/processing") java.exclude("com/facebook/react/module/processing")