diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle
index 3a23eabdc6feb4..f49c6e221569c0 100644
--- a/ReactAndroid/build.gradle
+++ b/ReactAndroid/build.gradle
@@ -322,18 +322,9 @@ android {
                     arguments "--output-sync=none"
                 }
 
-                // Note: On Windows there are limits on number of character in file paths and in command lines
-                // Ref: https://android.googlesource.com/platform/ndk/+/master/docs/BuildSystemMaintainers.md#Path-Length-Limits
-                // NDK allows circumventing command line limits using response(RSP) files as inputs using NDK_APP_SHORT_COMMANDS flag.
-                // 
-                // Windows can support long file paths if configured through registry or by prefixing all file paths with a special character sequence 
-                // The latter requires changes in NDK. And there are tools in NDK (AR) which is not able to handle long paths (>256) even after setting the registry key.
-                // The new architecutre source tree is too deep, and the object file naming conventions in NDK makes the matters worse, by producing incredibly long file paths.
-                // Other solutions such as symlinking source code etc. didn't work as expected, and makes the build scripts complicated and hard to manage.
-                // This change temporarily works around the issue by placing the temporary build outputs as short a path as possible within the project path.
+                // Fix for windows limit on number of character in file paths and in command lines
                 if (Os.isFamily(Os.FAMILY_WINDOWS)) {
-                    arguments "NDK_OUT=${rootProject.projectDir.getParent()}\\.cxx",
-                              "NDK_APP_SHORT_COMMANDS=true"
+                    arguments "NDK_APP_SHORT_COMMANDS=true"
                 }
             }
         }
diff --git a/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/Android.mk b/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/Android.mk
index 6495b130675500..25aaec488b0b68 100644
--- a/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/Android.mk
+++ b/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/Android.mk
@@ -13,6 +13,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := jsijniprofiler
 
 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 $(call find-node-module,$(LOCAL_PATH),hermes-engine)/android/include
 
diff --git a/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/Android.mk b/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/Android.mk
index 505bab63a3a0eb..28767582edbc80 100644
--- a/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/Android.mk
+++ b/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/Android.mk
@@ -12,6 +12,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := hermes-executor-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 $(call find-node-module,$(LOCAL_PATH),hermes-engine)/android/include
 
@@ -35,6 +36,7 @@ LOCAL_MODULE := hermes-executor-debug
 LOCAL_CFLAGS := -DHERMES_ENABLE_DEBUGGER=1
 
 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 $(call find-node-module,$(LOCAL_PATH),hermes-engine)/android/include
 
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 170afa13b106c2..b9f147cb7e6ef2 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 90efbec92e8f0e..de7eb09207a067 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/jscexecutor/Android.mk b/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/Android.mk
index 0bba11802b3fa8..21e87a443c0907 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/Android.mk
+++ b/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/Android.mk
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := jscexecutor
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/Android.mk b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/Android.mk
index 76e0bd7e22ebb0..ff14f7bb5b90dc 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/Android.mk
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/Android.mk
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := reactnativeblob
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 
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 be9ba3b82abb7e..0f62278824d7ce 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 fbf8752c816d56..12dbce0696b7d6 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/first-party/yogajni/Android.mk b/ReactAndroid/src/main/jni/first-party/yogajni/Android.mk
index c12312d2ea3402..0203420a1fab5f 100644
--- a/ReactAndroid/src/main/jni/first-party/yogajni/Android.mk
+++ b/ReactAndroid/src/main/jni/first-party/yogajni/Android.mk
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := yoga
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/jni/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/jni
 
diff --git a/ReactAndroid/src/main/jni/react/jni/Android.mk b/ReactAndroid/src/main/jni/react/jni/Android.mk
index 26c0a6c50a435a..3e1515aa5cd9ef 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 6092d28c5d932a..d7810a2837a5dc 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)/*.S)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/boost_1_63_0
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/boost_1_63_0
diff --git a/ReactCommon/butter/Android.mk b/ReactCommon/butter/Android.mk
index f2bbd9a7dc919a..fc8d3b38d1cc27 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/cxxreact/Android.mk b/ReactCommon/cxxreact/Android.mk
index 57533ee36cb1da..ef7343e283440d 100644
--- a/ReactCommon/cxxreact/Android.mk
+++ b/ReactCommon/cxxreact/Android.mk
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := reactnative
 
 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/hermes/executor/Android.mk b/ReactCommon/hermes/executor/Android.mk
index ecd36f8d6fcbee..9deb72dd72dac9 100644
--- a/ReactCommon/hermes/executor/Android.mk
+++ b/ReactCommon/hermes/executor/Android.mk
@@ -12,6 +12,7 @@ include $(CLEAR_VARS)
 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 $(call find-node-module,$(LOCAL_PATH),hermes-engine)/android/include
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
@@ -27,6 +28,7 @@ LOCAL_MODULE := hermes-executor-common-debug
 LOCAL_CFLAGS := -DHERMES_ENABLE_DEBUGGER=1
 
 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 $(call find-node-module,$(LOCAL_PATH),hermes-engine)/android/include
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
diff --git a/ReactCommon/hermes/inspector/Android.mk b/ReactCommon/hermes/inspector/Android.mk
index 77cef0a55b04b9..cddc17dc166efd 100644
--- a/ReactCommon/hermes/inspector/Android.mk
+++ b/ReactCommon/hermes/inspector/Android.mk
@@ -12,6 +12,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := hermes-inspector
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp $(LOCAL_PATH)/detail/*.cpp $(LOCAL_PATH)/chrome/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_ROOT := $(LOCAL_PATH)/../..
 
diff --git a/ReactCommon/jsi/Android.mk b/ReactCommon/jsi/Android.mk
index ee42537e70145c..ec9a3e0ba8904f 100644
--- a/ReactCommon/jsi/Android.mk
+++ b/ReactCommon/jsi/Android.mk
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := jsi
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/jsi/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
@@ -25,6 +26,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := jscruntime
 
 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/jsiexecutor/Android.mk b/ReactCommon/jsiexecutor/Android.mk
index 2c523fcbe28e8a..9f8d79ffcc788a 100644
--- a/ReactCommon/jsiexecutor/Android.mk
+++ b/ReactCommon/jsiexecutor/Android.mk
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := jsireact
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/jsireact/*.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/jsinspector/Android.mk b/ReactCommon/jsinspector/Android.mk
index 64fdbd0e635136..023fed0910ed62 100644
--- a/ReactCommon/jsinspector/Android.mk
+++ b/ReactCommon/jsinspector/Android.mk
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := jsinspector
 
 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/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 26354629e27b3a..fad744417a77ca 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 adbe9562631836..3f097e17f1c374 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)/../../../ $(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)/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 ea096c3132210d..8d1d931e1c9bc4 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 aa1c13ff3fc9a9..ac7a97f7d0cc21 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 7e8948d14ecf3f..0b89f14bcb00dd 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 29fb69f5a9ae32..db5afed429054c 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 ddac17423151cb..6406c5847d7786 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 62f84467af7c40..5f841fac916a06 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 dcbf866581b708..d2750c677e8313 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 2cd25871300e9f..448327b88cf041 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 cd9e66243298bc..aea0a3effb8023 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 e4515f601e54b2..95210acf3084aa 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 a008d6626e63e1..b7e811d88419c0 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 fb3332e487cfd5..351484d0f42804 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 81cf1438b999fd..42c966af8ca5bb 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 d421bd66af0951..755f9d34e7b7c5 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 a9594aff82783a..a2806b166086ef 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 e6544446d4f151..cc67ef7db75ef7 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 676b2bfae83fd7..9f90ff9a5f7c05 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 57f0d3821c1991..c888affce894cd 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 6a3c88ddb4de26..4489712b88a42e 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_json \
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 f9fb22951b223a..c229b305d61d6c 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 26a922c29cfcd3..df3b961bb0edb9 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 060d8ddf99d84a..cba95fb598e291 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 5cf7a2e41d49d8..18c0e95ded905c 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 c254a254e05f50..fbc7bf6cdde378 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 b393f1a6050017..3962f42c036a26 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 f7df613ccf3369..c77ab5ac3bdfc9 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/ReactCommon/yoga/Android.mk b/ReactCommon/yoga/Android.mk
index 23231fa32979b7..adc1816307e44d 100644
--- a/ReactCommon/yoga/Android.mk
+++ b/ReactCommon/yoga/Android.mk
@@ -11,6 +11,7 @@ LOCAL_MODULE := yogacore
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/yoga/*.cpp)
 LOCAL_SRC_FILES += $(wildcard $(LOCAL_PATH)/yoga/*/*.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/packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js
index 5b35d8c414b079..9713650c97e3ee 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 81e5237b295220..77135639f4c7f2 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
 
@@ -113,6 +114,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
 
@@ -177,6 +179,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
 
@@ -241,6 +244,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
 
@@ -313,6 +317,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
 
@@ -377,6 +382,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
 
@@ -449,6 +455,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 6cfdfccd460877..ebc0ca4567eaaf 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 ecaab597e516f8..35bf8cf9a1f697 100644
--- a/template/android/app/build.gradle
+++ b/template/android/app/build.gradle
@@ -158,11 +158,9 @@ 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_OUT=${rootProject.projectDir.getParent()}\\.cxx",
-                            "NDK_APP_SHORT_COMMANDS=true"
+                        arguments "NDK_APP_SHORT_COMMANDS=true"
                     }
                 }
             }
diff --git a/template/android/build.gradle b/template/android/build.gradle
index e7156fcc9ad301..5dfc68a632ee6a 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"