From 3d7ba8b7154fc69ec1a947492cd28a700dda8005 Mon Sep 17 00:00:00 2001 From: Ales Pergl Date: Wed, 12 Aug 2020 11:10:59 +0200 Subject: [PATCH 1/4] Don't create long paths during build to avoid failures on Windows --- .../main/java/com/facebook/hermes/instrumentation/Android.mk | 1 + .../src/main/java/com/facebook/hermes/reactexecutor/Android.mk | 2 ++ .../src/main/java/com/facebook/react/jscexecutor/Android.mk | 1 + .../main/java/com/facebook/react/modules/blob/jni/Android.mk | 1 + .../java/com/facebook/react/turbomodule/core/jni/Android.mk | 2 +- ReactAndroid/src/main/jni/first-party/yogajni/Android.mk | 1 + ReactCommon/cxxreact/Android.mk | 1 + ReactCommon/hermes/inspector/Android.mk | 1 + ReactCommon/jsi/Android.mk | 2 ++ ReactCommon/jsiexecutor/Android.mk | 1 + ReactCommon/jsinspector/Android.mk | 1 + ReactCommon/yoga/Android.mk | 1 + 12 files changed, 14 insertions(+), 1 deletion(-) 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 3548e86abd3c..58b348137548 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 ff05e4c14824..8ec0368e1019 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 @@ -29,6 +30,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/jscexecutor/Android.mk b/ReactAndroid/src/main/java/com/facebook/react/jscexecutor/Android.mk index c521147677c1..cebbf85a389e 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 53fb0c2bf557..6aad68fcd47f 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/turbomodule/core/jni/Android.mk b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/Android.mk index 955cc86a8b10..523afc3e0688 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 @@ -27,7 +27,7 @@ LOCAL_STATIC_LIBRARIES = libcallinvoker libreactperfloggerjni LOCAL_MODULE := callinvokerholder # Compile all local c++ files -LOCAL_SRC_FILES := $(LOCAL_PATH)/ReactCommon/CallInvokerHolder.cpp +LOCAL_SRC_FILES := ReactCommon/CallInvokerHolder.cpp # Build the files in this directory as a shared library include $(BUILD_STATIC_LIBRARY) diff --git a/ReactAndroid/src/main/jni/first-party/yogajni/Android.mk b/ReactAndroid/src/main/jni/first-party/yogajni/Android.mk index b2a8c5fdf61e..d57e26316d59 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/ReactCommon/cxxreact/Android.mk b/ReactCommon/cxxreact/Android.mk index a5024364c608..d67814163de7 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/inspector/Android.mk b/ReactCommon/hermes/inspector/Android.mk index a6692943e17d..46d2b1d81fd6 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 40c7042c16e3..475d4f2a9171 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 74ae7a65cef2..af6a297582e4 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 4ac555362365..b3c29df2d67c 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/yoga/Android.mk b/ReactCommon/yoga/Android.mk index d4ec34f9b322..d086b8b69ed1 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) From 379c1281a1dc36a12f9c5eee2cff7bfe4f1bab22 Mon Sep 17 00:00:00 2001 From: Anandraj Govindan Date: Sun, 24 Apr 2022 14:13:52 -0700 Subject: [PATCH 2/4] This change is extending the changes made by alespergl to reduce the file paths and command lengths of ndk build commands Essentially we are shortening the length of the source files by using relative paths instead of absolute paths as enumerated by the wildcard expression This commit is extending the fix by including all the new modules introduced into RN for the new architecture, including the generated modules. --- ReactAndroid/build.gradle | 13 ++----------- .../facebook/react/common/mapbuffer/jni/Android.mk | 1 + .../java/com/facebook/react/fabric/jni/Android.mk | 1 + .../facebook/react/reactperflogger/jni/Android.mk | 1 + .../facebook/react/turbomodule/core/jni/Android.mk | 4 +++- .../com/facebook/react/uimanager/jni/Android.mk | 1 + ReactAndroid/src/main/jni/react/jni/Android.mk | 2 ++ .../src/main/jni/third-party/boost/Android.mk | 1 + ReactCommon/butter/Android.mk | 1 + ReactCommon/hermes/executor/Android.mk | 2 ++ ReactCommon/logger/Android.mk | 1 + ReactCommon/react/config/Android.mk | 1 + ReactCommon/react/debug/Android.mk | 1 + ReactCommon/react/nativemodule/core/Android.mk | 1 + .../samples/platform/android/Android.mk | 1 + ReactCommon/react/renderer/animations/Android.mk | 1 + .../react/renderer/attributedstring/Android.mk | 1 + .../react/renderer/componentregistry/Android.mk | 1 + .../renderer/componentregistry/native/Android.mk | 1 + .../react/renderer/components/image/Android.mk | 1 + .../react/renderer/components/modal/Android.mk | 1 + .../renderer/components/progressbar/Android.mk | 1 + .../react/renderer/components/root/Android.mk | 1 + .../react/renderer/components/scrollview/Android.mk | 1 + .../react/renderer/components/slider/Android.mk | 1 + .../react/renderer/components/switch/Android.mk | 1 + .../react/renderer/components/text/Android.mk | 1 + .../react/renderer/components/textinput/Android.mk | 1 + .../components/unimplementedview/Android.mk | 1 + .../react/renderer/components/view/Android.mk | 1 + ReactCommon/react/renderer/core/Android.mk | 1 + ReactCommon/react/renderer/debug/Android.mk | 1 + ReactCommon/react/renderer/graphics/Android.mk | 1 + ReactCommon/react/renderer/imagemanager/Android.mk | 1 + ReactCommon/react/renderer/leakchecker/Android.mk | 1 + ReactCommon/react/renderer/mapbuffer/Android.mk | 1 + ReactCommon/react/renderer/mounting/Android.mk | 1 + .../react/renderer/runtimescheduler/Android.mk | 1 + ReactCommon/react/renderer/scheduler/Android.mk | 1 + ReactCommon/react/renderer/telemetry/Android.mk | 1 + .../react/renderer/templateprocessor/Android.mk | 1 + .../react/renderer/textlayoutmanager/Android.mk | 1 + ReactCommon/react/renderer/uimanager/Android.mk | 1 + ReactCommon/react/utils/Android.mk | 1 + ReactCommon/reactperflogger/Android.mk | 1 + .../src/generators/modules/GenerateModuleJniH.js | 1 + .../rn-tester/android/app/src/main/jni/Android.mk | 5 +++-- template/android/app/build.gradle | 5 ++--- template/android/build.gradle | 4 ---- 49 files changed, 56 insertions(+), 21 deletions(-) diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle index 3a23eabdc6fe..f49c6e221569 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/react/common/mapbuffer/jni/Android.mk b/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/Android.mk index 170afa13b106..b9f147cb7e6e 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 90efbec92e8f..de7eb09207a0 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 848a862f5029..04ab85dc0254 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 b7a066446f7a..0f62278824d7 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 @@ -27,7 +27,8 @@ LOCAL_STATIC_LIBRARIES = libcallinvoker libreactperfloggerjni LOCAL_MODULE := callinvokerholder # Compile all local c++ files -LOCAL_SRC_FILES := ReactCommon/CallInvokerHolder.cpp +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 fbf8752c816d..12dbce0696b7 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 26c0a6c50a43..3e1515aa5cd9 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 6092d28c5d93..d7810a2837a5 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 f2bbd9a7dc91..fc8d3b38d1cc 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 ecd36f8d6fcb..9deb72dd72da 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/logger/Android.mk b/ReactCommon/logger/Android.mk index 0d60adb35e9e..ca78f12e42ac 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 b209f810ae34..c4c2a409c709 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 26354629e27b..fad744417a77 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 adbe95626318..3f097e17f1c3 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 b7288750ca23..5c4458ec82a8 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 ea096c313221..8d1d931e1c9b 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 aa1c13ff3fc9..ac7a97f7d0cc 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 7e8948d14ecf..0b89f14bcb00 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 29fb69f5a9ae..db5afed42905 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 ddac17423151..6406c5847d77 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 62f84467af7c..5f841fac916a 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 dcbf866581b7..d2750c677e83 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 2cd25871300e..448327b88cf0 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 cd9e66243298..aea0a3effb80 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 e4515f601e54..95210acf3084 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 a008d6626e63..b7e811d88419 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 fb3332e487cf..351484d0f428 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 81cf1438b999..42c966af8ca5 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 d421bd66af09..755f9d34e7b7 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 a9594aff8278..a2806b166086 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 e6544446d4f1..cc67ef7db75e 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 676b2bfae83f..9f90ff9a5f7c 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 57f0d3821c19..c888affce894 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 6a3c88ddb4de..4489712b88a4 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 a76acf68904d..31dceaf7bebc 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 bccc61119992..7b9250cf357e 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 f9fb22951b22..c229b305d61d 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 2ec9150ae1bb..59aa098484ba 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 26a922c29cfc..df3b961bb0ed 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 060d8ddf99d8..cba95fb598e2 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 5cf7a2e41d49..18c0e95ded90 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 c254a254e05f..fbc7bf6cdde3 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 b393f1a60500..3962f42c036a 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 f7df613ccf33..c77ab5ac3bdf 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 c33f3381c46c..863a865a25d2 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 5b35d8c414b0..9713650c97e3 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/rn-tester/android/app/src/main/jni/Android.mk b/packages/rn-tester/android/app/src/main/jni/Android.mk index 6cfdfccd4608..ebc0ca4567ea 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 ecaab597e516..a68b1314061b 100644 --- a/template/android/app/build.gradle +++ b/template/android/app/build.gradle @@ -158,11 +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_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 e7156fcc9ad3..5dfc68a632ee 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" From 4da73985e5281980fd56da6edad59da76225c76b Mon Sep 17 00:00:00 2001 From: Anandraj Govindan Date: Sun, 24 Apr 2022 17:32:16 -0700 Subject: [PATCH 3/4] Updating snapshots of the codegen tests --- .../__snapshots__/GenerateModuleJniH-test.js.snap | 7 +++++++ 1 file changed, 7 insertions(+) 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 81e5237b2952..77135639f4c7 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 From 6ae1f8eba228a7b1b4c60ec354db2799ae8a01cf Mon Sep 17 00:00:00 2001 From: Anandraj Date: Thu, 5 May 2022 13:23:04 -0700 Subject: [PATCH 4/4] Update template/android/app/build.gradle MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Aleš Pergl --- template/android/app/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/template/android/app/build.gradle b/template/android/app/build.gradle index a68b1314061b..35bf8cf9a1f6 100644 --- a/template/android/app/build.gradle +++ b/template/android/app/build.gradle @@ -158,7 +158,6 @@ 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"