Breaking: Remove androidMkPath from react-native config

docs/autolinking.md

@@ -116,7 +116,6 @@ module.exports = {
         android: {
           libraryName: null,
           componentDescriptors: null,
-          androidMkPath: null,
           cmakeListsPath: null,
         },
       },

docs/dependencies.md

@@ -57,7 +57,6 @@ type AndroidDependencyParams = {
   buildTypes?: string[];
   libraryName?: string | null;
   componentDescriptors?: string[] | null;
-  androidMkPath?: string | null;
   cmakeListsPath?: string | null;
 };
 ```
@@ -136,12 +135,6 @@ A string indicating your custom library name. By default it's taken from the `li
 
 An array of custom component descriptor strings. By default they're generated based on `codegenNativeComponent` calls.
 
-#### platforms.android.androidMkPath
-
-> Note: Only applicable when new architecture is turned on.
-
-A relative path to a custom _Android.mk_ file not registered by codegen. Relative to `sourceDir`.
-
 #### platforms.android.cmakeListsPath
 
 > Note: Only applicable when new architecture is turned on.

docs/platforms.md

@@ -120,7 +120,6 @@ type AndroidDependencyConfig = {
   buildTypes: string[];
   libraryName?: string | null;
   componentDescriptors?: string[] | null;
-  androidMkPath?: string | null;
   cmakeListsPath?: string | null;
 };
 ```

packages/cli-config/src/schema.ts

@@ -85,7 +85,6 @@ export const dependencyConfig = t
                 buildTypes: t.array().items(t.string()).default([]),
                 libraryName: t.string().allow(null),
                 componentDescriptors: t.array().items(t.string()).allow(null),
-                androidMkPath: t.string().allow(null),
                 cmakeListsPath: t.string().allow(null),
               })
               .allow(null),
@@ -137,7 +136,6 @@ export const projectConfig = t
                 buildTypes: t.array().items(t.string()).default([]),
                 libraryName: t.string().allow(null),
                 componentDescriptors: t.array().items(t.string()).allow(null),
-                androidMkPath: t.string().allow(null),
                 cmakeListsPath: t.string().allow(null),
               })
               .allow(null),

packages/cli-platform-android/native_modules.gradle

@@ -68,14 +68,6 @@ public class PackageList {
 }
 """
 
-def androidMkTemplate = """# This code was generated by [React Native CLI](https://www.npmjs.com/package/@react-native-community/cli)
-
-{{ libraryIncludes }}
-
-import-codegen-modules := \\
-  {{ libraryModules }}
-"""
-
 def cmakeTemplate = """# This code was generated by [React Native CLI](https://www.npmjs.com/package/@react-native-community/cli)
 
 cmake_minimum_required(VERSION 3.13)
@@ -260,37 +252,6 @@ class ReactNativeModules {
     }
   }
 
-  void generateAndroidMkFile(File outputDir, String generatedFileName, String generatedFileContentsTemplate) {
-    ArrayList<HashMap<String, String>> packages = this.reactNativeModules
-    String packageName = this.packageName
-    String codegenLibPrefix = "libreact_codegen_"
-    String libraryIncludes = ""
-    String libraryModules = ""
-
-    if (packages.size() > 0) {
-      libraryIncludes = packages.collect {
-        if (it.androidMkPath != null && it.libraryName != null) {
-          "include ${it.androidMkPath}"
-        } else {
-          null
-        }
-      }.minus(null).join('\n')
-      libraryModules = packages.collect {
-        it.libraryName ? "${codegenLibPrefix}${it.libraryName}" : null
-      }.minus(null).join(" \\\n  ")
-    }
-
-    String generatedFileContents = generatedFileContentsTemplate
-      .replace("{{ libraryIncludes }}", libraryIncludes)
-      .replace("{{ libraryModules }}", libraryModules)
-
-    outputDir.mkdirs()
-    final FileTreeBuilder treeBuilder = new FileTreeBuilder(outputDir)
-    treeBuilder.file(generatedFileName).newWriter().withWriter { w ->
-      w << generatedFileContents
-    }
-  }
-
   void generateCmakeFile(File outputDir, String generatedFileName, String generatedFileContentsTemplate) {
     ArrayList<HashMap<String, String>> packages = this.reactNativeModules
     String packageName = this.packageName
@@ -304,11 +265,6 @@ class ReactNativeModules {
           // If user provided a custom cmakeListsPath, let's honor it.
           String nativeFolderPath = it.cmakeListsPath.replace("CMakeLists.txt", "")
           "add_subdirectory($nativeFolderPath ${it.libraryName}_autolinked_build)"
-        } else if (it.libraryName != null && it.androidMkPath != null) {
-          // Fallback to previous behavior: reusing androidMkPath.
-          // We assume CMakeLists.txt file is in the same folder as the Android.mk
-          String nativeFolderPath = it.androidMkPath.replace("Android.mk", "")
-          "add_subdirectory($nativeFolderPath ${it.libraryName}_autolinked_build)"
         } else {
           null
         }
@@ -474,7 +430,6 @@ class ReactNativeModules {
         reactNativeModuleConfig.put("packageImportPath", androidConfig["packageImportPath"])
         reactNativeModuleConfig.put("libraryName", androidConfig["libraryName"])
         reactNativeModuleConfig.put("componentDescriptors", androidConfig["componentDescriptors"])
-        reactNativeModuleConfig.put("androidMkPath", androidConfig["androidMkPath"])
         reactNativeModuleConfig.put("cmakeListsPath", androidConfig["cmakeListsPath"])
 
         if (androidConfig["buildTypes"] && !androidConfig["buildTypes"].isEmpty()) {
@@ -541,7 +496,6 @@ ext.applyNativeModulesAppBuildGradle = { Project project, String root = null ->
 
   task generateNewArchitectureFiles {
     doLast {
-      autoModules.generateAndroidMkFile(generatedJniDir, "Android-rncli.mk", androidMkTemplate)
       autoModules.generateCmakeFile(generatedJniDir, "Android-rncli.cmake", cmakeTemplate) 
       autoModules.generateRncliCpp(generatedJniDir, "rncli.cpp", rncliCppTemplate)
       autoModules.generateRncliH(generatedJniDir, "rncli.h", rncliHTemplate)

packages/cli-platform-android/src/config/index.ts

@@ -129,9 +129,6 @@ export function dependencyConfig(
     userConfig.libraryName || findLibraryName(root, sourceDir);
   const componentDescriptors =
     userConfig.componentDescriptors || findComponentDescriptors(root);
-  const androidMkPath = userConfig.androidMkPath
-    ? path.join(sourceDir, userConfig.androidMkPath)
-    : path.join(sourceDir, 'build/generated/source/codegen/jni/Android.mk');
   let cmakeListsPath = userConfig.cmakeListsPath
     ? path.join(sourceDir, userConfig.cmakeListsPath)
     : path.join(sourceDir, 'build/generated/source/codegen/jni/CMakeLists.txt');
@@ -146,7 +143,6 @@ export function dependencyConfig(
     dependencyConfiguration,
     libraryName,
     componentDescriptors,
-    androidMkPath,
     cmakeListsPath,
   };
 }

packages/cli-types/src/android.ts

@@ -21,7 +21,6 @@ export type AndroidDependencyConfig = {
   buildTypes: string[];
   libraryName?: string | null;
   componentDescriptors?: string[] | null;
-  androidMkPath?: string | null;
   cmakeListsPath?: string | null;
 };
 
@@ -35,6 +34,5 @@ export type AndroidDependencyParams = {
   buildTypes?: string[];
   libraryName?: string | null;
   componentDescriptors?: string[] | null;
-  androidMkPath?: string | null;
   cmakeListsPath?: string | null;
 };