diff --git a/ReactAndroid/src/main/jni/react/jni/Android.mk b/ReactAndroid/src/main/jni/react/jni/Android.mk
index 8b24a2fdae5..b3a1d0bbf07 100644
--- a/ReactAndroid/src/main/jni/react/jni/Android.mk
+++ b/ReactAndroid/src/main/jni/react/jni/Android.mk
@@ -39,7 +39,7 @@ LOCAL_STATIC_LIBRARIES := libreactnative libcallinvokerholder libruntimeexecutor
 LOCAL_MODULE := reactnativeutilsjni
 
 # Compile all local c++ files.
-LOCAL_SRC_FILES := $(wildcard Cxx*.cpp) $(wildcard J*.cpp) $(wildcard M*.cpp) $(wildcard N*.cpp) $(wildcard P*.cpp) $(wildcard R*.cpp) $(wildcard W*.cpp)
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
 
 ifeq ($(APP_OPTIM),debug)
   # Keep symbols by overriding the strip command invoked by ndk-build.
diff --git a/ReactAndroid/src/main/jni/third-party/libevent/Android.mk b/ReactAndroid/src/main/jni/third-party/libevent/Android.mk
index 2cffc67fca6..e546d1b711f 100644
--- a/ReactAndroid/src/main/jni/third-party/libevent/Android.mk
+++ b/ReactAndroid/src/main/jni/third-party/libevent/Android.mk
@@ -12,7 +12,6 @@ LOCAL_SRC_FILES := event.c \
 	bufferevent_ratelim.c \
 	bufferevent_sock.c \
 	epoll.c \
-	event.c \
 	evmap.c \
 	evthread.c \
 	evthread_pthread.c \
diff --git a/ReactCommon/react/renderer/runtimescheduler/Android.mk b/ReactCommon/react/renderer/runtimescheduler/Android.mk
index 3ceac57d6b1..2e81b329eab 100644
--- a/ReactCommon/react/renderer/runtimescheduler/Android.mk
+++ b/ReactCommon/react/renderer/runtimescheduler/Android.mk
@@ -15,7 +15,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
 
-LOCAL_SHARED_LIBRARIES := libruntimeexecutor libreact_render_core
+LOCAL_SHARED_LIBRARIES := libruntimeexecutor libreact_render_core libreact_debug
 
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"Fabric\"