diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/Android.mk b/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/Android.mk
index b56517b8ff0756..48f83b0da7dbf3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/Android.mk
+++ b/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/Android.mk
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := mapbufferjni
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/react/common/mapbuffer/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_SHARED_LIBRARIES := \
   libfb \
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Android.mk b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Android.mk
index 4d3b97aee7e35d..a32e9e10d1d5b8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Android.mk
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Android.mk
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := fabricjni
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_SHARED_LIBRARIES := \
   libbutter \
diff --git a/ReactAndroid/src/main/java/com/facebook/react/reactperflogger/jni/Android.mk b/ReactAndroid/src/main/java/com/facebook/react/reactperflogger/jni/Android.mk
index 848a862f50296c..04ab85dc02546d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/reactperflogger/jni/Android.mk
+++ b/ReactAndroid/src/main/java/com/facebook/react/reactperflogger/jni/Android.mk
@@ -26,6 +26,7 @@ LOCAL_MODULE := reactperfloggerjni
 
 # Compile all local c++ files
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/reactperflogger/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 # Build the files in this directory as a shared library
 include $(BUILD_SHARED_LIBRARY)
diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/Android.mk b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/Android.mk
index f590cb77f322b4..5d978c9c35cabc 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/Android.mk
+++ b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/Android.mk
@@ -28,6 +28,7 @@ LOCAL_MODULE := callinvokerholder
 
 # Compile all local c++ files
 LOCAL_SRC_FILES := $(LOCAL_PATH)/ReactCommon/CallInvokerHolder.cpp
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 # Build the files in this directory as a shared library
 include $(BUILD_STATIC_LIBRARY)
@@ -56,6 +57,7 @@ LOCAL_STATIC_LIBRARIES = libcallinvokerholder libreactperfloggerjni
 
 # Compile all local c++ files
 LOCAL_SRC_FILES := $(LOCAL_PATH)/ReactCommon/TurboModuleManager.cpp $(LOCAL_PATH)/ReactCommon/OnLoad.cpp
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 # Build the files in this directory as a shared library
 include $(BUILD_SHARED_LIBRARY)
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/Android.mk b/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/Android.mk
index a685bf3a300e37..109b4a917cffbf 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/Android.mk
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/Android.mk
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := uimanagerjni
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_SHARED_LIBRARIES := \
   libfb \
diff --git a/ReactAndroid/src/main/jni/react/jni/Android.mk b/ReactAndroid/src/main/jni/react/jni/Android.mk
index 69b7e01d128888..f07858762685de 100644
--- a/ReactAndroid/src/main/jni/react/jni/Android.mk
+++ b/ReactAndroid/src/main/jni/react/jni/Android.mk
@@ -47,6 +47,7 @@ LOCAL_MODULE := reactnativeutilsjni
 
 # Compile all local c++ files.
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 ifeq ($(APP_OPTIM),debug)
   # Keep symbols by overriding the strip command invoked by ndk-build.
@@ -106,6 +107,7 @@ LOCAL_MODULE := reactnativejni
 
 # Compile all local c++ files.
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 ifeq ($(APP_OPTIM),debug)
   # Keep symbols by overriding the strip command invoked by ndk-build.
diff --git a/ReactAndroid/src/main/jni/third-party/boost/Android.mk b/ReactAndroid/src/main/jni/third-party/boost/Android.mk
index 032f8a8b3fc9fc..9560de94eda528 100644
--- a/ReactAndroid/src/main/jni/third-party/boost/Android.mk
+++ b/ReactAndroid/src/main/jni/third-party/boost/Android.mk
@@ -5,6 +5,7 @@ include $(CLEAR_VARS)
 # because the react native version does not include anything outside of headers.
 # They are required for Folly futures to compile successfully.
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/asm/$(TARGET_ARCH_ABI)/*.S)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/boost_1_76_0
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/boost_1_76_0
diff --git a/ReactCommon/butter/Android.mk b/ReactCommon/butter/Android.mk
index cda21ea7506c81..36cf73b114cc4e 100644
--- a/ReactCommon/butter/Android.mk
+++ b/ReactCommon/butter/Android.mk
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := butter
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/
diff --git a/ReactCommon/hermes/executor/Android.mk b/ReactCommon/hermes/executor/Android.mk
index d5e42a1fa9d309..a0e00a11a6e1c6 100644
--- a/ReactCommon/hermes/executor/Android.mk
+++ b/ReactCommon/hermes/executor/Android.mk
@@ -12,7 +12,8 @@ ifeq ($(APP_OPTIM),debug)
   LOCAL_MODULE := hermes-executor-common-debug
   LOCAL_CFLAGS := -DHERMES_ENABLE_DEBUGGER=1
 
-  LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+ LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
   LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi
   LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
@@ -27,6 +28,7 @@ else
   LOCAL_MODULE := hermes-executor-common-release
 
   LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+  LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
   LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi
   LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
diff --git a/ReactCommon/logger/Android.mk b/ReactCommon/logger/Android.mk
index 0d60adb35e9e25..ca78f12e42ace3 100644
--- a/ReactCommon/logger/Android.mk
+++ b/ReactCommon/logger/Android.mk
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := logger
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
diff --git a/ReactCommon/react/config/Android.mk b/ReactCommon/react/config/Android.mk
index b209f810ae3449..c4c2a409c70996 100644
--- a/ReactCommon/react/config/Android.mk
+++ b/ReactCommon/react/config/Android.mk
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := react_config
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../
diff --git a/ReactCommon/react/debug/Android.mk b/ReactCommon/react/debug/Android.mk
index 39be4fd41f7c1b..09e3f381e05afe 100644
--- a/ReactCommon/react/debug/Android.mk
+++ b/ReactCommon/react/debug/Android.mk
@@ -12,6 +12,7 @@ LOCAL_MODULE := react_debug
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
 
diff --git a/ReactCommon/react/nativemodule/core/Android.mk b/ReactCommon/react/nativemodule/core/Android.mk
index 677bfec76d3a3c..5a08467b2e962e 100644
--- a/ReactCommon/react/nativemodule/core/Android.mk
+++ b/ReactCommon/react/nativemodule/core/Android.mk
@@ -12,6 +12,7 @@ LOCAL_MODULE := react_nativemodule_core
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/ReactCommon $(LOCAL_PATH)/platform/android/ReactCommon
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/ReactCommon/*.cpp) $(wildcard $(LOCAL_PATH)/platform/android/ReactCommon/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../ $(LOCAL_PATH) $(LOCAL_PATH)/platform/android/
 
diff --git a/ReactCommon/react/nativemodule/samples/platform/android/Android.mk b/ReactCommon/react/nativemodule/samples/platform/android/Android.mk
index b7288750ca2368..5c4458ec82a8f2 100644
--- a/ReactCommon/react/nativemodule/samples/platform/android/Android.mk
+++ b/ReactCommon/react/nativemodule/samples/platform/android/Android.mk
@@ -9,6 +9,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := sampleturbomodule
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/ReactCommon/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_SHARED_LIBRARIES := \
   libfbjni \
diff --git a/ReactCommon/react/renderer/animations/Android.mk b/ReactCommon/react/renderer/animations/Android.mk
index ce6a627e1b0ef3..c5168c4e0be853 100644
--- a/ReactCommon/react/renderer/animations/Android.mk
+++ b/ReactCommon/react/renderer/animations/Android.mk
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := react_render_animations
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
diff --git a/ReactCommon/react/renderer/attributedstring/Android.mk b/ReactCommon/react/renderer/attributedstring/Android.mk
index eddbaa9bcd63b5..687a29d580d4b8 100644
--- a/ReactCommon/react/renderer/attributedstring/Android.mk
+++ b/ReactCommon/react/renderer/attributedstring/Android.mk
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := react_render_attributedstring
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
diff --git a/ReactCommon/react/renderer/componentregistry/Android.mk b/ReactCommon/react/renderer/componentregistry/Android.mk
index 3d4a1379eb4017..4be170a8b27e2f 100644
--- a/ReactCommon/react/renderer/componentregistry/Android.mk
+++ b/ReactCommon/react/renderer/componentregistry/Android.mk
@@ -12,6 +12,7 @@ LOCAL_MODULE := react_render_componentregistry
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
 
diff --git a/ReactCommon/react/renderer/componentregistry/native/Android.mk b/ReactCommon/react/renderer/componentregistry/native/Android.mk
index 3e469cf20f1cc4..a4fdc90c41950e 100644
--- a/ReactCommon/react/renderer/componentregistry/native/Android.mk
+++ b/ReactCommon/react/renderer/componentregistry/native/Android.mk
@@ -12,6 +12,7 @@ LOCAL_MODULE := rrc_native
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../../
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../
 
diff --git a/ReactCommon/react/renderer/components/image/Android.mk b/ReactCommon/react/renderer/components/image/Android.mk
index 220412cd6ac7a8..b67ca0d1673f5f 100644
--- a/ReactCommon/react/renderer/components/image/Android.mk
+++ b/ReactCommon/react/renderer/components/image/Android.mk
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := rrc_image
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../
diff --git a/ReactCommon/react/renderer/components/modal/Android.mk b/ReactCommon/react/renderer/components/modal/Android.mk
index 7b96f9b9fbff30..6506921bb6565f 100644
--- a/ReactCommon/react/renderer/components/modal/Android.mk
+++ b/ReactCommon/react/renderer/components/modal/Android.mk
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := rrc_modal
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../
diff --git a/ReactCommon/react/renderer/components/progressbar/Android.mk b/ReactCommon/react/renderer/components/progressbar/Android.mk
index 82fa81563d2758..329a616717acb2 100644
--- a/ReactCommon/react/renderer/components/progressbar/Android.mk
+++ b/ReactCommon/react/renderer/components/progressbar/Android.mk
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := rrc_progressbar
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/android/react/renderer/components/progressbar/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/android/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/android/
diff --git a/ReactCommon/react/renderer/components/root/Android.mk b/ReactCommon/react/renderer/components/root/Android.mk
index 370a6dc576adf4..2fef31ee3a78ff 100644
--- a/ReactCommon/react/renderer/components/root/Android.mk
+++ b/ReactCommon/react/renderer/components/root/Android.mk
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := rrc_root
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../
diff --git a/ReactCommon/react/renderer/components/scrollview/Android.mk b/ReactCommon/react/renderer/components/scrollview/Android.mk
index f45267d27d735d..1183e69d2d929d 100644
--- a/ReactCommon/react/renderer/components/scrollview/Android.mk
+++ b/ReactCommon/react/renderer/components/scrollview/Android.mk
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := rrc_scrollview
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../
diff --git a/ReactCommon/react/renderer/components/slider/Android.mk b/ReactCommon/react/renderer/components/slider/Android.mk
index 1d533b86f1a832..f4ea402f1788ed 100644
--- a/ReactCommon/react/renderer/components/slider/Android.mk
+++ b/ReactCommon/react/renderer/components/slider/Android.mk
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := rrc_slider
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/platform/android/react/renderer/components/slider/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/ $(LOCAL_PATH)/platform/android/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../ $(LOCAL_PATH)/platform/android/
diff --git a/ReactCommon/react/renderer/components/switch/Android.mk b/ReactCommon/react/renderer/components/switch/Android.mk
index e254c06de69d0a..5595fc08a0ee16 100644
--- a/ReactCommon/react/renderer/components/switch/Android.mk
+++ b/ReactCommon/react/renderer/components/switch/Android.mk
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := rrc_switch
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/androidswitch/react/renderer/components/androidswitch/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/androidswitch/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/androidswitch/
diff --git a/ReactCommon/react/renderer/components/text/Android.mk b/ReactCommon/react/renderer/components/text/Android.mk
index 6d604894aaa9a0..fb849bfbcb8731 100644
--- a/ReactCommon/react/renderer/components/text/Android.mk
+++ b/ReactCommon/react/renderer/components/text/Android.mk
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := rrc_text
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../
diff --git a/ReactCommon/react/renderer/components/textinput/Android.mk b/ReactCommon/react/renderer/components/textinput/Android.mk
index a8572954c580a5..55bcbf7333f811 100644
--- a/ReactCommon/react/renderer/components/textinput/Android.mk
+++ b/ReactCommon/react/renderer/components/textinput/Android.mk
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := rrc_textinput
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/androidtextinput/react/renderer/components/androidtextinput/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/androidtextinput/react/renderer/components/androidtextinput/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/androidtextinput/
diff --git a/ReactCommon/react/renderer/components/unimplementedview/Android.mk b/ReactCommon/react/renderer/components/unimplementedview/Android.mk
index c6fdcad16eea8b..4b2790193eb333 100644
--- a/ReactCommon/react/renderer/components/unimplementedview/Android.mk
+++ b/ReactCommon/react/renderer/components/unimplementedview/Android.mk
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := rrc_unimplementedview
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../
diff --git a/ReactCommon/react/renderer/components/view/Android.mk b/ReactCommon/react/renderer/components/view/Android.mk
index 01f14d057ca5cb..a72ada8f493dec 100644
--- a/ReactCommon/react/renderer/components/view/Android.mk
+++ b/ReactCommon/react/renderer/components/view/Android.mk
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := rrc_view
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../../
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../
diff --git a/ReactCommon/react/renderer/core/Android.mk b/ReactCommon/react/renderer/core/Android.mk
index 8f5400379d7d62..0a632e9c5de6a5 100644
--- a/ReactCommon/react/renderer/core/Android.mk
+++ b/ReactCommon/react/renderer/core/Android.mk
@@ -12,6 +12,7 @@ LOCAL_MODULE := react_render_core
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
 
diff --git a/ReactCommon/react/renderer/debug/Android.mk b/ReactCommon/react/renderer/debug/Android.mk
index 45a08f478aa425..03197646d6773c 100644
--- a/ReactCommon/react/renderer/debug/Android.mk
+++ b/ReactCommon/react/renderer/debug/Android.mk
@@ -12,6 +12,7 @@ LOCAL_MODULE := react_render_debug
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
 
diff --git a/ReactCommon/react/renderer/graphics/Android.mk b/ReactCommon/react/renderer/graphics/Android.mk
index d1078d99ab4784..72031a2ab8ae76 100644
--- a/ReactCommon/react/renderer/graphics/Android.mk
+++ b/ReactCommon/react/renderer/graphics/Android.mk
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := react_render_graphics
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp $(LOCAL_PATH)/platform/cxx/react/renderer/graphics/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_SHARED_LIBRARIES := \
   glog \
diff --git a/ReactCommon/react/renderer/imagemanager/Android.mk b/ReactCommon/react/renderer/imagemanager/Android.mk
index a7013405950820..d7cff3c77defa0 100644
--- a/ReactCommon/react/renderer/imagemanager/Android.mk
+++ b/ReactCommon/react/renderer/imagemanager/Android.mk
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := react_render_imagemanager
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp $(LOCAL_PATH)/platform/cxx/react/renderer/imagemanager/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_SHARED_LIBRARIES := \
   libfolly_runtime \
diff --git a/ReactCommon/react/renderer/leakchecker/Android.mk b/ReactCommon/react/renderer/leakchecker/Android.mk
index a76acf68904d05..31dceaf7bebcce 100644
--- a/ReactCommon/react/renderer/leakchecker/Android.mk
+++ b/ReactCommon/react/renderer/leakchecker/Android.mk
@@ -12,6 +12,7 @@ LOCAL_MODULE := react_render_leakchecker
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
 
diff --git a/ReactCommon/react/renderer/mapbuffer/Android.mk b/ReactCommon/react/renderer/mapbuffer/Android.mk
index bccc6111999212..7b9250cf357ee4 100644
--- a/ReactCommon/react/renderer/mapbuffer/Android.mk
+++ b/ReactCommon/react/renderer/mapbuffer/Android.mk
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := react_render_mapbuffer
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
diff --git a/ReactCommon/react/renderer/mounting/Android.mk b/ReactCommon/react/renderer/mounting/Android.mk
index 613d77b3e93e96..432d11160aa481 100644
--- a/ReactCommon/react/renderer/mounting/Android.mk
+++ b/ReactCommon/react/renderer/mounting/Android.mk
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := react_render_mounting
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
diff --git a/ReactCommon/react/renderer/runtimescheduler/Android.mk b/ReactCommon/react/renderer/runtimescheduler/Android.mk
index 2ec9150ae1bb3b..59aa098484ba7b 100644
--- a/ReactCommon/react/renderer/runtimescheduler/Android.mk
+++ b/ReactCommon/react/renderer/runtimescheduler/Android.mk
@@ -12,6 +12,7 @@ LOCAL_MODULE := react_render_runtimescheduler
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
 
diff --git a/ReactCommon/react/renderer/scheduler/Android.mk b/ReactCommon/react/renderer/scheduler/Android.mk
index 246af42a9448b4..0eec52d2568bc0 100644
--- a/ReactCommon/react/renderer/scheduler/Android.mk
+++ b/ReactCommon/react/renderer/scheduler/Android.mk
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := react_render_scheduler
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
diff --git a/ReactCommon/react/renderer/telemetry/Android.mk b/ReactCommon/react/renderer/telemetry/Android.mk
index 01456036442157..9ca9c7868d89f6 100644
--- a/ReactCommon/react/renderer/telemetry/Android.mk
+++ b/ReactCommon/react/renderer/telemetry/Android.mk
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := react_render_telemetry
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
diff --git a/ReactCommon/react/renderer/templateprocessor/Android.mk b/ReactCommon/react/renderer/templateprocessor/Android.mk
index f6827f980270f3..c810ecdaa098f4 100644
--- a/ReactCommon/react/renderer/templateprocessor/Android.mk
+++ b/ReactCommon/react/renderer/templateprocessor/Android.mk
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := react_render_templateprocessor
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
diff --git a/ReactCommon/react/renderer/textlayoutmanager/Android.mk b/ReactCommon/react/renderer/textlayoutmanager/Android.mk
index 6a724e0e8f4831..a57d0eee6f06ce 100644
--- a/ReactCommon/react/renderer/textlayoutmanager/Android.mk
+++ b/ReactCommon/react/renderer/textlayoutmanager/Android.mk
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := react_render_textlayoutmanager
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp $(LOCAL_PATH)/platform/android/react/renderer/textlayoutmanager/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_SHARED_LIBRARIES := \
   glog \
diff --git a/ReactCommon/react/renderer/uimanager/Android.mk b/ReactCommon/react/renderer/uimanager/Android.mk
index a492a5000fa83f..caf9cd09a7599e 100644
--- a/ReactCommon/react/renderer/uimanager/Android.mk
+++ b/ReactCommon/react/renderer/uimanager/Android.mk
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := react_render_uimanager
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
diff --git a/ReactCommon/react/utils/Android.mk b/ReactCommon/react/utils/Android.mk
index 53ebb849034544..625a8f54e25608 100644
--- a/ReactCommon/react/utils/Android.mk
+++ b/ReactCommon/react/utils/Android.mk
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := react_utils
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/../../
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../
diff --git a/ReactCommon/reactperflogger/Android.mk b/ReactCommon/reactperflogger/Android.mk
index c33f3381c46cb7..863a865a25d2b8 100644
--- a/ReactCommon/reactperflogger/Android.mk
+++ b/ReactCommon/reactperflogger/Android.mk
@@ -20,6 +20,7 @@ LOCAL_MODULE := reactperflogger
 
 # Compile all local c++ files under ./ReactCommon
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/reactperflogger/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 # Build the files in this directory as a shared library
 include $(BUILD_STATIC_LIBRARY)
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js
index 4efc085c5ad728..8825b05a589d28 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js
@@ -77,6 +77,7 @@ LOCAL_MODULE := react_codegen_${libraryName}
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/react/renderer/components/${libraryName}/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/${libraryName}
 
diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniH-test.js.snap b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniH-test.js.snap
index 60b36af1d3e778..0ab8a73f50bfa6 100644
--- a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniH-test.js.snap
+++ b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniH-test.js.snap
@@ -49,6 +49,7 @@ LOCAL_MODULE := react_codegen_SampleWithUppercaseName
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/react/renderer/components/SampleWithUppercaseName/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/SampleWithUppercaseName
 
@@ -157,6 +158,7 @@ LOCAL_MODULE := react_codegen_complex_objects
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/react/renderer/components/complex_objects/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/complex_objects
 
@@ -265,6 +267,7 @@ LOCAL_MODULE := react_codegen_empty_native_modules
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/react/renderer/components/empty_native_modules/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/empty_native_modules
 
@@ -373,6 +376,7 @@ LOCAL_MODULE := react_codegen_native_modules_with_type_aliases
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/react/renderer/components/native_modules_with_type_aliases/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/native_modules_with_type_aliases
 
@@ -489,6 +493,7 @@ LOCAL_MODULE := react_codegen_real_module_example
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/react/renderer/components/real_module_example/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/real_module_example
 
@@ -597,6 +602,7 @@ LOCAL_MODULE := react_codegen_simple_native_modules
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/react/renderer/components/simple_native_modules/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/simple_native_modules
 
@@ -713,6 +719,7 @@ LOCAL_MODULE := react_codegen_two_modules_different_files
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/react/renderer/components/two_modules_different_files/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/two_modules_different_files
 
diff --git a/packages/rn-tester/android/app/src/main/jni/Android.mk b/packages/rn-tester/android/app/src/main/jni/Android.mk
index a02ac90bccb498..a912fec85e1585 100644
--- a/packages/rn-tester/android/app/src/main/jni/Android.mk
+++ b/packages/rn-tester/android/app/src/main/jni/Android.mk
@@ -15,9 +15,10 @@ LOCAL_PATH := $(THIS_DIR)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := rntester_appmodules
-# Note: Build the react-native-codegen output along with other app-specific C++ files.
+# Note: We are linking against react_codegen_rntester hence no need to built the react-native-codegen output.
 LOCAL_C_INCLUDES := $(LOCAL_PATH) $(GENERATED_SRC_DIR)/codegen/jni
-LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(GENERATED_SRC_DIR)/codegen/jni/*.cpp)
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(GENERATED_SRC_DIR)/codegen/jni
 LOCAL_SHARED_LIBRARIES := \
   libfabricjni \
diff --git a/template/android/app/build.gradle b/template/android/app/build.gradle
index 3081a1f27f8a4c..1647d41e494b48 100644
--- a/template/android/app/build.gradle
+++ b/template/android/app/build.gradle
@@ -158,6 +158,10 @@ android {
                     // Make sure this target name is the same you specify inside the
                     // src/main/jni/Android.mk file for the `LOCAL_MODULE` variable.
                     targets "helloworld_appmodules"
+                    // Fix for windows limit on number of character in file paths and in command lines
+                    if (Os.isFamily(Os.FAMILY_WINDOWS)) {
+                        arguments "NDK_APP_SHORT_COMMANDS=true"
+                    }
                 }
             }
             if (!enableSeparateBuildPerCPUArchitecture) {
diff --git a/template/android/build.gradle b/template/android/build.gradle
index a53bfbfd50d656..c9bc539de9c4b0 100644
--- a/template/android/build.gradle
+++ b/template/android/build.gradle
@@ -12,10 +12,6 @@ buildscript {
         if (System.properties['os.arch'] == "aarch64") {
             // For M1 Users we need to use the NDK 24 which added support for aarch64
             ndkVersion = "24.0.8215888"
-        } else if (Os.isFamily(Os.FAMILY_WINDOWS)) {
-            // For Android Users, we need to use NDK 23, otherwise the build will
-            // fail due to paths longer than the OS limit
-            ndkVersion = "23.1.7779620"
         } else {
             // Otherwise we default to the side-by-side NDK version from AGP.
             ndkVersion = "21.4.7075529"