react-native 0.68.2 → 0.69.0-rc.2

package/ReactAndroid/src/main/jni/CMakeLists.txt

@@ -0,0 +1,102 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+project(ReactAndroid)
+
+# Make sure every shared lib includes a .note.gnu.build-id header
+add_link_options(-Wl,--build-id)
+add_compile_options(-Wall -Werror -std=c++1y)
+
+function(add_react_android_subdir relative_path)
+  add_subdirectory(${REACT_ANDROID_DIR}/${relative_path} ReactAndroid/${relative_path})
+endfunction()
+
+function(add_react_third_party_ndk_subdir relative_path)
+  add_react_android_subdir(build/third-party-ndk/${relative_path})
+endfunction()
+
+function(add_react_common_subdir relative_path)
+  add_subdirectory(${REACT_COMMON_DIR}/${relative_path} ReactCommon/${relative_path})
+endfunction()
+
+# Third-party prefabs
+find_package(hermes-engine REQUIRED CONFIG)
+
+# Third-party downloaded targets
+add_react_third_party_ndk_subdir(glog)
+add_react_third_party_ndk_subdir(boost)
+add_react_third_party_ndk_subdir(double-conversion)
+add_react_third_party_ndk_subdir(fmt)
+add_react_third_party_ndk_subdir(libevent)
+add_react_third_party_ndk_subdir(folly)
+add_react_third_party_ndk_subdir(jsc)
+
+# Common targets
+add_react_common_subdir(yoga)
+add_react_common_subdir(runtimeexecutor)
+add_react_common_subdir(reactperflogger)
+add_react_common_subdir(logger)
+add_react_common_subdir(jsiexecutor)
+add_react_common_subdir(cxxreact)
+add_react_common_subdir(jsi)
+add_react_common_subdir(butter)
+add_react_common_subdir(callinvoker)
+add_react_common_subdir(jsinspector)
+add_react_common_subdir(hermes/executor)
+add_react_common_subdir(hermes/inspector)
+add_react_common_subdir(react/renderer/runtimescheduler)
+add_react_common_subdir(react/debug)
+add_react_common_subdir(react/config)
+add_react_common_subdir(react/renderer/animations)
+add_react_common_subdir(react/renderer/attributedstring)
+add_react_common_subdir(react/renderer/componentregistry)
+add_react_common_subdir(react/renderer/mounting)
+add_react_common_subdir(react/renderer/scheduler)
+add_react_common_subdir(react/renderer/telemetry)
+add_react_common_subdir(react/renderer/templateprocessor)
+add_react_common_subdir(react/renderer/uimanager)
+add_react_common_subdir(react/renderer/core)
+add_react_common_subdir(react/renderer/graphics)
+add_react_common_subdir(react/renderer/debug)
+add_react_common_subdir(react/renderer/imagemanager)
+add_react_common_subdir(react/renderer/components/view)
+add_react_common_subdir(react/renderer/components/switch)
+add_react_common_subdir(react/renderer/components/textinput)
+add_react_common_subdir(react/renderer/components/progressbar)
+add_react_common_subdir(react/renderer/components/slider)
+add_react_common_subdir(react/renderer/components/root)
+add_react_common_subdir(react/renderer/components/image)
+add_react_common_subdir(react/renderer/componentregistry/native)
+add_react_common_subdir(react/renderer/components/text)
+add_react_common_subdir(react/renderer/components/unimplementedview)
+add_react_common_subdir(react/renderer/components/modal)
+add_react_common_subdir(react/renderer/components/scrollview)
+add_react_common_subdir(react/renderer/leakchecker)
+add_react_common_subdir(react/renderer/textlayoutmanager)
+add_react_common_subdir(react/utils)
+add_react_common_subdir(react/bridging)
+add_react_common_subdir(react/renderer/mapbuffer)
+add_react_common_subdir(react/nativemodule/core)
+
+# ReactAndroid JNI targets
+add_react_android_subdir(build/generated/source/codegen/jni)
+add_react_android_subdir(src/main/java/com/facebook/hermes/reactexecutor)
+add_react_android_subdir(src/main/jni/first-party/fbjni)
+add_react_android_subdir(src/main/jni/first-party/fb)
+add_react_android_subdir(src/main/jni/first-party/fbgloginit)
+add_react_android_subdir(src/main/jni/first-party/yogajni)
+add_react_android_subdir(src/main/jni/react/jni)
+add_react_android_subdir(src/main/java/com/facebook/react/reactperflogger/jni)
+add_react_android_subdir(src/main/java/com/facebook/react/jscexecutor)
+add_react_android_subdir(src/main/java/com/facebook/react/turbomodule/core/jni)
+add_react_android_subdir(src/main/java/com/facebook/react/uimanager/jni)
+add_react_android_subdir(src/main/java/com/facebook/react/common/mapbuffer/jni)
+add_react_android_subdir(src/main/java/com/facebook/react/fabric/jni)
+add_react_android_subdir(src/main/java/com/facebook/react/modules/blob/jni)
+add_react_android_subdir(src/main/java/com/facebook/hermes/instrumentation/)
+

package/ReactAndroid/src/main/jni/first-party/fb/BUCK

@@ -19,7 +19,7 @@ oss_cxx_library(
         "-fexceptions",
         "-Wall",
         "-Werror",
-        "-std=c++14",
+        "-std=c++17",
         "-DDISABLE_CPUCAP",
         "-DDISABLE_XPLAT",
     ],

package/ReactAndroid/src/main/jni/first-party/fb/CMakeLists.txt

@@ -0,0 +1,28 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+add_library(fb
+        SHARED
+        assert.cpp
+        log.cpp)
+
+add_compile_options(
+        -DLOG_TAG=\"libfb\"
+        -DDISABLE_CPUCAP
+        -DDISABLE_XPLAT
+        -fexceptions
+        -frtti
+        -Wno-unused-parameter
+        -Wno-error=unused-but-set-variable
+        -DHAVE_POSIX_CLOCKS
+)
+
+# Yogacore needs to link towards android and log from the NDK libs
+target_link_libraries(fb dl android log)
+
+target_include_directories(fb PUBLIC include)

package/ReactAndroid/src/main/jni/first-party/fbgloginit/CMakeLists.txt

@@ -0,0 +1,15 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+add_compile_options(-fexceptions -fno-omit-frame-pointer)
+
+add_library(glog_init SHARED glog_init.cpp)
+
+target_include_directories(glog_init PUBLIC .)
+
+target_link_libraries(glog_init log glog)

package/ReactAndroid/src/main/jni/first-party/fbjni/CMakeLists.txt

@@ -0,0 +1,15 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+add_library(fbjni SHARED IMPORTED GLOBAL)
+set_target_properties(fbjni
+        PROPERTIES
+        IMPORTED_LOCATION
+        ${CMAKE_CURRENT_SOURCE_DIR}/jni/${ANDROID_ABI}/libfbjni.so)
+
+target_include_directories(fbjni INTERFACE headers)

package/ReactAndroid/src/main/jni/first-party/hermes/CMakeLists.txt

@@ -0,0 +1,13 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+add_library(hermes SHARED IMPORTED GLOBAL)
+set_target_properties(hermes
+        PROPERTIES
+        IMPORTED_LOCATION
+        ${CMAKE_CURRENT_SOURCE_DIR}/jni/${ANDROID_ABI}/libhermes.so)

package/ReactAndroid/src/main/jni/first-party/yogajni/CMakeLists.txt

@@ -0,0 +1,20 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+add_compile_options(
+        -fvisibility=hidden
+        -fexceptions
+        -frtti
+        -O3)
+
+file(GLOB yoga_SRC CONFIGURE_DEPENDS jni/*.cpp)
+add_library(yoga SHARED ${yoga_SRC})
+
+target_include_directories(yoga PUBLIC jni)
+
+target_link_libraries(yoga yogacore fb fbjni log android)

package/ReactAndroid/src/main/jni/first-party/yogajni/jni/ScopedGlobalRef.h

@@ -36,7 +36,7 @@ namespace vanillajni {
  * This class is very explicit in its behavior, and it does not allow to perform
  * unexpected conversions or unexpected ownership transfer. In practice, this
  * class acts as a unique pointer where the underying JNI reference can have one
- * and just one owner. Transfering ownership is allowed but it is an explicit
+ * and just one owner. Transferring ownership is allowed but it is an explicit
  * operation (implemneted via move semantics and also via explicity API calls).
  *
  * Note that this class doesn't receive an explicit JNIEnv at construction time.

package/ReactAndroid/src/main/jni/first-party/yogajni/jni/ScopedLocalRef.h

@@ -38,7 +38,7 @@ namespace vanillajni {
  * This class is very explicit in its behavior, and it does not allow to perform
  * unexpected conversions or unexpected ownership transfer. In practice, this
  * class acts as a unique pointer where the underying JNI reference can have one
- * and just one owner. Transfering ownership is allowed but it is an explicit
+ * and just one owner. Transferring ownership is allowed but it is an explicit
  * operation (implemneted via move semantics and also via explicity API calls).
  *
  * As with standard JNI local references it is not a valid operation to keep a

package/ReactAndroid/src/main/jni/react/jni/Android.mk

@@ -22,7 +22,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)
 #   ./../ == react
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../..
 
-LOCAL_CFLAGS += -fexceptions -frtti -Wno-unused-lambda-capture
+LOCAL_CFLAGS += -fexceptions -frtti -Wno-unused-lambda-capture -std=c++17
 
 LOCAL_LDLIBS += -landroid
 
@@ -30,7 +30,7 @@ LOCAL_LDLIBS += -landroid
 LOCAL_SHARED_LIBRARIES := \
   libfb \
   libfbjni \
-  libfolly_json \
+  libfolly_runtime \
   libglog_init \
   libreact_render_runtimescheduler \
   libruntimeexecutor \
@@ -80,7 +80,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)
 #   ./../ == react
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../..
 
-LOCAL_CFLAGS += -fexceptions -frtti -Wno-unused-lambda-capture
+LOCAL_CFLAGS += -fexceptions -frtti -Wno-unused-lambda-capture -std=c++17
 
 LOCAL_LDLIBS += -landroid
 
@@ -88,7 +88,7 @@ LOCAL_LDLIBS += -landroid
 LOCAL_SHARED_LIBRARIES := \
   libfb \
   libfbjni \
-  libfolly_json \
+  libfolly_runtime \
   libglog_init \
   libreact_render_runtimescheduler \
   libreactnativeutilsjni \
@@ -145,11 +145,18 @@ $(call import-module,jsiexecutor)
 $(call import-module,logger)
 $(call import-module,callinvoker)
 $(call import-module,reactperflogger)
-$(call import-module,hermes)
 $(call import-module,runtimeexecutor)
 $(call import-module,react/renderer/runtimescheduler)
 $(call import-module,react/nativemodule/core)
 
+# This block is needed only because we build the project on NDK r17 internally.
+ifneq ($(call ndk-major-at-least,21),true)
+    $(call import-add-path,$(NDK_GRADLE_INJECTED_IMPORT_PATH))
+endif
+
+$(call import-module,prefab/hermes-engine)
+
+
 include $(REACT_SRC_DIR)/reactperflogger/jni/Android.mk
 # TODO (T48588859): Restructure this target to align with dir structure: "react/nativemodule/..."
 # Note: Update this only when ready to minimize breaking changes.

package/ReactAndroid/src/main/jni/react/jni/BUCK

@@ -41,7 +41,10 @@ rn_xplat_cxx_library(
     compiler_flags_enable_exceptions = True,
     compiler_flags_enable_rtti = True,  # dynamic_cast used within ReadableNative*
     fbandroid_allow_jni_merging = True,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     platforms = ANDROID,
     preprocessor_flags = [
         "-DLOG_TAG=\"ReactNativeJNI\"",

package/ReactAndroid/src/main/jni/react/jni/CMakeLists.txt

@@ -0,0 +1,73 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+# TODO Those two libraries are building against the same sources
+# and should probably be merged
+file(GLOB reactnativejni_SRC CONFIGURE_DEPENDS *.cpp)
+
+add_compile_options(
+        -fexceptions
+        -frtti
+        -Wno-unused-lambda-capture
+        -std=c++17
+        -DWITH_INSPECTOR=1)
+
+##########################
+### React Native Utils ###
+##########################
+
+add_library(
+        reactnativeutilsjni
+        SHARED
+        ${reactnativejni_SRC}
+)
+
+# TODO This should not be ../../
+target_include_directories(reactnativeutilsjni PUBLIC ../../)
+
+target_link_libraries(reactnativeutilsjni
+        android
+        callinvokerholder
+        fb
+        fbjni
+        folly_runtime
+        glog_init
+        react_render_runtimescheduler
+        reactnative
+        runtimeexecutor
+        yoga
+        )
+
+######################
+### reactnativejni ###
+######################
+
+
+add_library(
+        reactnativejni
+        SHARED
+        ${reactnativejni_SRC}
+)
+
+# TODO This should not be ../../
+target_include_directories(reactnativejni PUBLIC ../../)
+
+target_link_libraries(reactnativejni
+        android
+        callinvokerholder
+        fb
+        fbjni
+        folly_runtime
+        glog_init
+        logger
+        react_render_runtimescheduler
+        reactnative
+        reactnativeutilsjni
+        runtimeexecutor
+        yoga
+        )

package/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp

@@ -8,6 +8,7 @@
 #include "CatalystInstanceImpl.h"
 
 #include <condition_variable>
+#include <fstream>
 #include <memory>
 #include <mutex>
 #include <sstream>
@@ -248,6 +249,26 @@ void CatalystInstanceImpl::jniRegisterSegment(
   instance_->registerBundle((uint32_t)segmentId, path);
 }
 
+static ScriptTag getScriptTagFromFile(const char *sourcePath) {
+  std::ifstream bundle_stream(sourcePath, std::ios_base::in);
+  BundleHeader header;
+  if (bundle_stream &&
+      bundle_stream.read(reinterpret_cast<char *>(&header), sizeof(header))) {
+    return parseTypeFromHeader(header);
+  } else {
+    return ScriptTag::String;
+  }
+}
+
+static bool isIndexedRAMBundle(std::unique_ptr<const JSBigString> *script) {
+  BundleHeader header;
+  strncpy(
+      reinterpret_cast<char *>(&header),
+      script->get()->c_str(),
+      sizeof(header));
+  return parseTypeFromHeader(header) == ScriptTag::RAMBundle;
+}
+
 void CatalystInstanceImpl::jniLoadScriptFromAssets(
     jni::alias_ref<JAssetManager::javaobject> assetManager,
     const std::string &assetURL,
@@ -263,7 +284,7 @@ void CatalystInstanceImpl::jniLoadScriptFromAssets(
     instance_->loadRAMBundle(
         std::move(registry), std::move(script), sourceURL, loadSynchronously);
     return;
-  } else if (Instance::isIndexedRAMBundle(&script)) {
+  } else if (isIndexedRAMBundle(&script)) {
     instance_->loadRAMBundleFromString(std::move(script), sourceURL);
   } else {
     instance_->loadScriptFromString(
@@ -276,38 +297,48 @@ void CatalystInstanceImpl::jniLoadScriptFromFile(
     const std::string &sourceURL,
     bool loadSynchronously) {
   auto reactInstance = instance_;
-  if (reactInstance && Instance::isHBCBundle(fileName.c_str())) {
-    std::unique_ptr<const JSBigFileString> script;
-    RecoverableError::runRethrowingAsRecoverable<std::system_error>(
-        [&fileName, &script]() {
-          script = JSBigFileString::fromPath(fileName);
-        });
-    const char *buffer = script->c_str();
-    uint32_t bufferLength = (uint32_t)script->size();
-    uint32_t offset = 8;
-    while (offset < bufferLength) {
-      uint32_t segment = offset + 4;
-      uint32_t moduleLength =
-          bufferLength < segment ? 0 : *(((uint32_t *)buffer) + offset / 4);
-
-      reactInstance->loadScriptFromString(
-          std::make_unique<const JSBigStdString>(
-              std::string(buffer + segment, buffer + moduleLength + segment)),
-          sourceURL,
-          false);
-
-      offset += ((moduleLength + 3) & ~3) + 4;
+  if (!reactInstance) {
+    return;
+  }
+
+  switch (getScriptTagFromFile(fileName.c_str())) {
+    case ScriptTag::MetroHBCBundle: {
+      std::unique_ptr<const JSBigFileString> script;
+      RecoverableError::runRethrowingAsRecoverable<std::system_error>(
+          [&fileName, &script]() {
+            script = JSBigFileString::fromPath(fileName);
+          });
+      const char *buffer = script->c_str();
+      uint32_t bufferLength = (uint32_t)script->size();
+      uint32_t offset = 8;
+      while (offset < bufferLength) {
+        uint32_t segment = offset + 4;
+        uint32_t moduleLength =
+            bufferLength < segment ? 0 : *(((uint32_t *)buffer) + offset / 4);
+
+        reactInstance->loadScriptFromString(
+            std::make_unique<const JSBigStdString>(
+                std::string(buffer + segment, buffer + moduleLength + segment)),
+            sourceURL,
+            false);
+
+        offset += ((moduleLength + 3) & ~3) + 4;
+      }
+      break;
+    }
+    case ScriptTag::RAMBundle:
+      instance_->loadRAMBundleFromFile(fileName, sourceURL, loadSynchronously);
+      break;
+    case ScriptTag::String:
+    default: {
+      std::unique_ptr<const JSBigFileString> script;
+      RecoverableError::runRethrowingAsRecoverable<std::system_error>(
+          [&fileName, &script]() {
+            script = JSBigFileString::fromPath(fileName);
+          });
+      instance_->loadScriptFromString(
+          std::move(script), sourceURL, loadSynchronously);
     }
-  } else if (Instance::isIndexedRAMBundle(fileName.c_str())) {
-    instance_->loadRAMBundleFromFile(fileName, sourceURL, loadSynchronously);
-  } else {
-    std::unique_ptr<const JSBigFileString> script;
-    RecoverableError::runRethrowingAsRecoverable<std::system_error>(
-        [&fileName, &script]() {
-          script = JSBigFileString::fromPath(fileName);
-        });
-    instance_->loadScriptFromString(
-        std::move(script), sourceURL, loadSynchronously);
   }
 }
 

package/ReactAndroid/src/main/jni/react/jni/JSLoader.cpp

@@ -77,7 +77,7 @@ loadScriptFromAssets(AAssetManager *manager, const std::string &assetName) {
         // script to ensure we have a terminator.
         const BundleHeader *header =
             reinterpret_cast<const BundleHeader *>(script->c_str());
-        if (parseTypeFromHeader(*header) == ScriptTag::HBCBundle) {
+        if (isHermesBytecodeBundle(*header)) {
           return script;
         }
       }

package/ReactAndroid/src/main/jni/react/jni/ReadableNativeArray.cpp

@@ -20,6 +20,7 @@ __attribute__((visibility("default")))
 ReadableNativeArray::ReadableNativeArray(folly::dynamic array)
     : HybridBase(std::move(array)) {}
 
+// TODO T112842309: Remove after fbjni upgraded in OSS
 void ReadableNativeArray::mapException(const std::exception &ex) {
   if (dynamic_cast<const folly::TypeError *>(&ex) != nullptr) {
     throwNewJavaException(
@@ -27,6 +28,15 @@ void ReadableNativeArray::mapException(const std::exception &ex) {
   }
 }
 
+void ReadableNativeArray::mapException(std::exception_ptr ex) {
+  try {
+    std::rethrow_exception(ex);
+  } catch (const folly::TypeError &err) {
+    throwNewJavaException(
+        exceptions::gUnexpectedNativeTypeExceptionClass, err.what());
+  }
+}
+
 local_ref<JArrayClass<jobject>> ReadableNativeArray::importArray() {
   jint size = array_.size();
   auto jarray = JArrayClass<jobject>::newArray(size);

package/ReactAndroid/src/main/jni/react/jni/ReadableNativeArray.h

@@ -31,9 +31,11 @@ class ReadableNativeArray
       "Lcom/facebook/react/bridge/ReadableNativeArray;";
 
   static void mapException(const std::exception &ex);
+  static void mapException(std::exception_ptr ex);
+  static void registerNatives();
+
   jni::local_ref<jni::JArrayClass<jobject>> importArray();
   jni::local_ref<jni::JArrayClass<jobject>> importTypeArray();
-  static void registerNatives();
 };
 
 } // namespace react

package/ReactAndroid/src/main/jni/react/jni/ReadableNativeMap.cpp

@@ -12,6 +12,7 @@ using namespace facebook::jni;
 namespace facebook {
 namespace react {
 
+// TODO T112842309: Remove after fbjni upgraded in OSS
 void ReadableNativeMap::mapException(const std::exception &ex) {
   if (dynamic_cast<const folly::TypeError *>(&ex) != nullptr) {
     throwNewJavaException(
@@ -19,6 +20,15 @@ void ReadableNativeMap::mapException(const std::exception &ex) {
   }
 }
 
+void ReadableNativeMap::mapException(std::exception_ptr ex) {
+  try {
+    std::rethrow_exception(ex);
+  } catch (const folly::TypeError &err) {
+    throwNewJavaException(
+        exceptions::gUnexpectedNativeTypeExceptionClass, err.what());
+  }
+}
+
 void addDynamicToJArray(
     local_ref<JArrayClass<jobject>> jarray,
     jint index,

package/ReactAndroid/src/main/jni/react/jni/ReadableNativeMap.h

@@ -42,7 +42,7 @@ struct ReadableNativeMap : jni::HybridClass<ReadableNativeMap, NativeMap> {
   static jni::local_ref<jhybridobject> createWithContents(folly::dynamic &&map);
 
   static void mapException(const std::exception &ex);
-
+  static void mapException(std::exception_ptr ex);
   static void registerNatives();
 
   using HybridBase::HybridBase;

package/ReactAndroid/src/main/jni/third-party/boost/Android.mk

@@ -4,11 +4,11 @@ include $(CLEAR_VARS)
 # These ASM files are picked from the boost release separately,
 # 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 := $(wildcard $(LOCAL_PATH)/asm/$(TARGET_ARCH_ABI)/*.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
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/boost_1_76_0
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/boost_1_76_0
 
 LOCAL_MODULE := boost
 

package/ReactAndroid/src/main/jni/third-party/boost/CMakeLists.txt

@@ -0,0 +1,22 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+# These ASM files are picked from the boost release separately,
+# because the react native version does not include anything outside of headers.
+# They are required for Folly futures to compile successfully.
+ENABLE_LANGUAGE(ASM)
+file(GLOB_RECURSE
+        boostasm_SRC
+        CONFIGURE_DEPENDS
+        ${CMAKE_CURRENT_SOURCE_DIR}/asm/${ANDROID_ABI}/*.S)
+add_library(boost STATIC ${boostasm_SRC})
+
+set_target_properties(boost PROPERTIES LINKER_LANGUAGE CXX)
+
+target_include_directories(boost PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/boost_1_76_0)
+

package/ReactAndroid/src/main/jni/third-party/double-conversion/CMakeLists.txt

@@ -0,0 +1,23 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+add_compile_options(-Wno-unused-variable -Wno-unused-local-typedefs)
+
+add_library(double-conversion
+        STATIC
+        double-conversion/bignum.cc
+        double-conversion/bignum-dtoa.cc
+        double-conversion/cached-powers.cc
+        double-conversion/diy-fp.cc
+        double-conversion/double-conversion.cc
+        double-conversion/fast-dtoa.cc
+        double-conversion/fixed-dtoa.cc
+        double-conversion/strtod.cc)
+
+target_include_directories(double-conversion PUBLIC .)
+