From ffb183174b81af904a7c5d8d2cd5347308715ba4 Mon Sep 17 00:00:00 2001 From: Nicola Corti Date: Tue, 10 Aug 2021 08:58:25 -0700 Subject: [PATCH] Cleanup warnings in the NDK build Summary: This diff is cleaning up some configurations in the `Android.mk` files of the native build. Specifically I simplified some of the rules and removed a duplicate file specification. Changelog: Internal - Cleanup warnings in the NDK build Reviewed By: ShikaSD Differential Revision: D30220715 fbshipit-source-id: a100953fe977879a6d28cb0a2ef4b3358fb7c774 --- ReactAndroid/src/main/jni/react/jni/Android.mk | 2 +- ReactAndroid/src/main/jni/third-party/libevent/Android.mk | 1 - ReactCommon/react/renderer/runtimescheduler/Android.mk | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) 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\"