react-native-reanimated 2.10.0 → 2.11.0

package/android/CMakeLists.txt

@@ -1,17 +1,20 @@
 project(Reanimated)
-cmake_minimum_required(VERSION 3.12.0)
+cmake_minimum_required(VERSION 3.8)
 
 set (CMAKE_VERBOSE_MAKEFILE ON)
 set (CMAKE_CXX_STANDARD 17)
-set (DEFAULT_FLAGS "-DFOLLY_NO_CONFIG=1 -DFOLLY_HAVE_CLOCK_GETTIME=1 -DFOLLY_HAVE_MEMRCHR=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_MOBILE=1 -DFOLLY_HAVE_RECVMMSG=1 -DFOLLY_HAVE_PTHREAD=1 -DON_ANDROID -DONANDROID -DANDROID -DRNVERSION=${RNVERSION} -fexceptions -fno-omit-frame-pointer -frtti -Wno-sign-compare -std=c++17 -Wall")
+set (DEFAULT_FLAGS "-DFOLLY_NO_CONFIG=1 -DFOLLY_HAVE_CLOCK_GETTIME=1 -DFOLLY_HAVE_MEMRCHR=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_MOBILE=1 -DFOLLY_HAVE_RECVMMSG=1 -DFOLLY_HAVE_PTHREAD=1 -DANDROID -DREACT_NATIVE_MINOR_VERSION=${REACT_NATIVE_MINOR_VERSION} -fexceptions -fno-omit-frame-pointer -frtti -Wno-sign-compare -std=c++17 -Wall -Werror")
 if(${IS_NEW_ARCHITECTURE_ENABLED})
     set (ALL_FLAGS "${DEFAULT_FLAGS} -DRCT_NEW_ARCH_ENABLED")
 else()
     set (ALL_FLAGS ${DEFAULT_FLAGS})
 endif()
+if(${CMAKE_BUILD_TYPE} STREQUAL "Debug" AND NOT ${REANIMATED_PACKAGE_BUILD} STREQUAL "1")
+    set (ALL_FLAGS "${ALL_FLAGS} -DDEBUG")
+endif()
 set (CMAKE_CXX_FLAGS ${ALL_FLAGS})
 
-if(${NATIVE_DEBUG})
+if(${CMAKE_BUILD_TYPE} STREQUAL "Debug" AND NOT ${REANIMATED_PACKAGE_BUILD} STREQUAL "1")
     set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g")
     set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g")
 endif()
@@ -23,25 +26,20 @@ set (PACKAGE_NAME "reanimated")
 set (BUILD_DIR ${CMAKE_SOURCE_DIR}/build)
 set (SRC_DIR ${CMAKE_SOURCE_DIR}/src)
 
-set (ignoreMe "${PLAYGROUND_APP_NAME}")
-
-if(${CLIENT_SIDE_BUILD})
-    set (COMMON_SRC_DIR "${CMAKE_SOURCE_DIR}/../Common")
-else()
-    set (COMMON_SRC_DIR "${SRC_DIR}/main/Common")
-endif()
-
+set (COMMON_SRC_DIR "${CMAKE_SOURCE_DIR}/../Common")
 if(${IS_NEW_ARCHITECTURE_ENABLED})
     if(${CLIENT_SIDE_BUILD})
         set (RN_SO_DIR "${CMAKE_SOURCE_DIR}/../../../android/app/build/react-ndk/exported")
-        set (FBJNI_HEADERS_DIR "${CMAKE_SOURCE_DIR}/../../react-native/ReactAndroid/src/main/jni/first-party/fbjni/headers")
+        set (FBJNI_HEADERS_DIR "${REACT_NATIVE_DIR}/ReactAndroid/src/main/jni/first-party/fbjni/headers")
     else()
+        # Reanimated Playground app
         set (RN_SO_DIR "${CMAKE_SOURCE_DIR}/../${PLAYGROUND_APP_NAME}/android/app/build/react-ndk/exported")
-        set (FBJNI_HEADERS_DIR "${CMAKE_SOURCE_DIR}/../${PLAYGROUND_APP_NAME}/node_modules/react-native/ReactAndroid/src/main/jni/first-party/fbjni/headers")
+        set (FBJNI_HEADERS_DIR "${REACT_NATIVE_DIR}/ReactAndroid/src/main/jni/first-party/fbjni/headers")
+
     endif()
 else()
-    set (RN_SO_DIR ${NODE_MODULES_DIR}/react-native/ReactAndroid/src/main/jni/first-party/react/jni)
-    set (FBJNI_HEADERS_DIR "${NODE_MODULES_DIR}/react-native/ReactAndroid/src/main/jni/first-party/fbjni/headers")
+    set (RN_SO_DIR ${REACT_NATIVE_DIR}/ReactAndroid/src/main/jni/first-party/react/jni)
+    set (FBJNI_HEADERS_DIR "${REACT_NATIVE_DIR}/ReactAndroid/src/main/jni/first-party/fbjni/headers")
 endif()
 
 file (GLOB LIBRN_DIR "${RN_SO_DIR}/${ANDROID_ABI}")
@@ -49,26 +47,15 @@ file (GLOB LIBRN_DIR "${RN_SO_DIR}/${ANDROID_ABI}")
 file(GLOB_RECURSE SOURCES_COMMON CONFIGURE_DEPENDS "${COMMON_SRC_DIR}/cpp/**.cpp")
 file(GLOB_RECURSE SOURCES_ANDROID CONFIGURE_DEPENDS "${SRC_DIR}/main/cpp/**.cpp")
 
-if(${REACT_NATIVE_TARGET_VERSION} LESS 66)
-    set (
-            INCLUDE_JSI_CPP
-            "${NODE_MODULES_DIR}/react-native/ReactCommon/jsi/jsi/jsi.cpp"
-    )
-    set (
-            INCLUDE_JSIDYNAMIC_CPP
-            "${NODE_MODULES_DIR}/react-native/ReactCommon/jsi/jsi/JSIDynamic.cpp"
-    )
-endif()
-
-if(${IS_NEW_ARCHITECTURE_ENABLED})
-    set(
-            FABRIC_UTILS_CPP
-            "${COMMON_SRC_DIR}/cpp/Fabric/FabricUtils.cpp"
-    )
-    set(
-            REANIMATED_UI_MANAGER_BINDING_CPP
-            "${COMMON_SRC_DIR}/cpp/Fabric/ReanimatedUIManagerBinding.cpp"
-    )
+if(${REACT_NATIVE_MINOR_VERSION} LESS 66)
+        set (
+                INCLUDE_JSI_CPP
+                "${REACT_NATIVE_DIR}/ReactCommon/jsi/jsi/jsi.cpp"
+        )
+        set (
+                INCLUDE_JSIDYNAMIC_CPP
+                "${REACT_NATIVE_DIR}/ReactCommon/jsi/jsi/JSIDynamic.cpp"
+        )
 endif()
 
 add_library(
@@ -78,8 +65,6 @@ add_library(
         ${SOURCES_ANDROID}
         ${INCLUDE_JSI_CPP}
         ${INCLUDE_JSIDYNAMIC_CPP}
-        ${FABRIC_UTILS_CPP}
-        ${REANIMATED_UI_MANAGER_BINDING_CPP}
 )
 
 # includes
@@ -94,29 +79,29 @@ target_include_directories(
         "${BUILD_DIR}/third-party-ndk/double-conversion"
         "${BUILD_DIR}/third-party-ndk/folly"
         "${BUILD_DIR}/third-party-ndk/glog/exported"
-        "${NODE_MODULES_DIR}/react-native/React"
-        "${NODE_MODULES_DIR}/react-native/React/Base"
-        "${NODE_MODULES_DIR}/react-native/ReactAndroid/src/main/jni"
-        "${NODE_MODULES_DIR}/react-native/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni"
-        "${NODE_MODULES_DIR}/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/jni"
-        "${NODE_MODULES_DIR}/react-native/ReactCommon"
-        "${NODE_MODULES_DIR}/react-native/ReactCommon/callinvoker"
-        "${NODE_MODULES_DIR}/react-native/ReactCommon/jsi"
-        "${NODE_MODULES_DIR}/react-native/ReactCommon/react/renderer/graphics/platform/cxx"
-        "${NODE_MODULES_DIR}/react-native/ReactCommon/runtimeexecutor"
-        "${NODE_MODULES_DIR}/react-native/ReactCommon/turbomodule/core"
-        "${NODE_MODULES_DIR}/react-native/ReactCommon/turbomodule"
-        "${NODE_MODULES_DIR}/react-native/ReactCommon/yoga"
-        "${COMMON_SRC_DIR}/cpp/headers/Tools"
-        "${COMMON_SRC_DIR}/cpp/headers/SpecTools"
-        "${COMMON_SRC_DIR}/cpp/headers/NativeModules"
-        "${COMMON_SRC_DIR}/cpp/headers/SharedItems"
-        "${COMMON_SRC_DIR}/cpp/headers/Registries"
-        "${COMMON_SRC_DIR}/cpp/headers/LayoutAnimations"
-        "${COMMON_SRC_DIR}/cpp/headers/AnimatedSensor"
-        "${COMMON_SRC_DIR}/cpp/headers/Fabric"
+        "${REACT_NATIVE_DIR}/React"
+        "${REACT_NATIVE_DIR}/React/Base"
+        "${REACT_NATIVE_DIR}/ReactAndroid/src/main/jni"
+        "${REACT_NATIVE_DIR}/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni"
+        "${REACT_NATIVE_DIR}/ReactAndroid/src/main/java/com/facebook/react/fabric/jni"
+        "${REACT_NATIVE_DIR}/ReactCommon"
+        "${REACT_NATIVE_DIR}/ReactCommon/callinvoker"
+        "${REACT_NATIVE_DIR}/ReactCommon/jsi"
+        "${REACT_NATIVE_DIR}/ReactCommon/react/renderer/graphics/platform/cxx"
+        "${REACT_NATIVE_DIR}/ReactCommon/runtimeexecutor"
+        "${REACT_NATIVE_DIR}/ReactCommon/turbomodule/core"
+        "${REACT_NATIVE_DIR}/ReactCommon/turbomodule"
+        "${REACT_NATIVE_DIR}/ReactCommon/yoga"
+        "${COMMON_SRC_DIR}/cpp/Tools"
+        "${COMMON_SRC_DIR}/cpp/SpecTools"
+        "${COMMON_SRC_DIR}/cpp/NativeModules"
+        "${COMMON_SRC_DIR}/cpp/SharedItems"
+        "${COMMON_SRC_DIR}/cpp/Registries"
+        "${COMMON_SRC_DIR}/cpp/LayoutAnimations"
+        "${COMMON_SRC_DIR}/cpp/AnimatedSensor"
+        "${COMMON_SRC_DIR}/cpp/Fabric"
         "${COMMON_SRC_DIR}/cpp/hidden_headers"
-        "${SRC_DIR}/main/cpp/headers"
+        "${SRC_DIR}/main/cpp"
 )
 
 find_library(
@@ -142,7 +127,7 @@ find_library(
         NO_CMAKE_FIND_ROOT_PATH
 )
 
-if(${REACT_NATIVE_TARGET_VERSION} LESS 69)
+if(${REACT_NATIVE_MINOR_VERSION} LESS 69)
     find_library(
             FOLLY_LIB
             folly_json
@@ -158,7 +143,7 @@ else()
     )
 endif()
 
-if(${REACT_NATIVE_TARGET_VERSION} LESS 66)
+if(${REACT_NATIVE_MINOR_VERSION} LESS 66)
     set (JSI_LIB "")
 else()
     find_library(
@@ -250,7 +235,7 @@ target_link_libraries(
 
 if(${JS_RUNTIME} STREQUAL "hermes")
     string(APPEND CMAKE_CXX_FLAGS " -DJS_RUNTIME_HERMES=1")
-    if(${REACT_NATIVE_TARGET_VERSION} LESS 69)
+    if(${REACT_NATIVE_MINOR_VERSION} LESS 69)
         # From `hermes-engine` npm package
         target_include_directories(
                 ${PACKAGE_NAME}
@@ -289,7 +274,6 @@ elseif(${JS_RUNTIME} STREQUAL "v8")
             ${V8EXECUTOR_LIB}
     )
 else()
-    set (ignoreMe "${JS_RUNTIME_DIR}")
     string(APPEND CMAKE_CXX_FLAGS " -DJS_RUNTIME_JSC=1")
     find_library(
             JSEXECUTOR_LIB
@@ -319,7 +303,7 @@ if(${IS_NEW_ARCHITECTURE_ENABLED})
     )
 endif()
 
-if(${REACT_NATIVE_TARGET_VERSION} LESS 64)
+if(${REACT_NATIVE_MINOR_VERSION} LESS 64)
     add_library(
             turbomodulejsijni
             # Sets the library as a shared library.
@@ -327,4 +311,11 @@ if(${REACT_NATIVE_TARGET_VERSION} LESS 64)
             # Provides a relative path to your source file(s).
             ./empty.cpp
     )
-endif()
+endif()
+
+# Resolves "CMake Warning: Manually-specified variables were not used by the project"
+# when any of the following variables is not used in some build configuration.
+set (ignoreMe "${CLIENT_SIDE_BUILD}")
+set (ignoreMe "${JS_RUNTIME_DIR}")
+set (ignoreMe "${PLAYGROUND_APP_NAME}")
+set (ignoreMe "${HERMES_ENABLE_DEBUGGER}")