diff --git a/template/android/app/src/main/jni/Android.mk b/template/android/app/src/main/jni/Android.mk
index e2c306187ab2a7..55732a705bcff6 100644
--- a/template/android/app/src/main/jni/Android.mk
+++ b/template/android/app/src/main/jni/Android.mk
@@ -16,22 +16,10 @@ LOCAL_PATH := $(THIS_DIR)
 # You can customize the name of your application .so file here.
 LOCAL_MODULE := helloworld_appmodules
 
-LOCAL_C_INCLUDES := $(LOCAL_PATH)
-LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
-
-# Autolinked TurboModules and Fabric components
-LOCAL_C_INCLUDES += $(PROJECT_BUILD_DIR)/generated/rncli/src/main/jni
-LOCAL_SRC_FILES += $(wildcard $(PROJECT_BUILD_DIR)/generated/rncli/src/main/jni/*.cpp)
-LOCAL_EXPORT_C_INCLUDES += $(PROJECT_BUILD_DIR)/generated/rncli/src/main/jni
-
-# If you wish to add a custom TurboModule or Fabric component in your app you
-# will have to uncomment those lines to include the generated source
-# files from the codegen (placed in $(GENERATED_SRC_DIR)/codegen/jni)
-#
-# LOCAL_C_INCLUDES += $(GENERATED_SRC_DIR)/codegen/jni
-# LOCAL_SRC_FILES += $(wildcard $(GENERATED_SRC_DIR)/codegen/jni/*.cpp)
-# LOCAL_EXPORT_C_INCLUDES += $(GENERATED_SRC_DIR)/codegen/jni
+# The generated/rncli/src/main/jni folder contains Autolinking support files.
+LOCAL_C_INCLUDES := $(LOCAL_PATH) $(PROJECT_BUILD_DIR)/generated/rncli/src/main/jni
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(PROJECT_BUILD_DIR)/generated/rncli/src/main/jni/*.cpp)
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(PROJECT_BUILD_DIR)/generated/rncli/src/main/jni
 
 # Here you should add any native library you wish to depend on.
 LOCAL_SHARED_LIBRARIES := \
@@ -55,6 +43,11 @@ LOCAL_SHARED_LIBRARIES := \
 # Autolinked libraries
 LOCAL_SHARED_LIBRARIES += $(call import-codegen-modules) 
 
+# If you wish to add a custom TurboModule or Fabric component in your app you
+# will have to link against it here:
+# LOCAL_SHARED_LIBRARIES += \
+#   libreact_codegen_<your library name>
+
 LOCAL_CFLAGS := -DLOG_TAG=\"ReactNative\" -fexceptions -frtti -std=c++17 -Wall
 
 include $(BUILD_SHARED_LIBRARY)