react-native 0.68.1 → 0.69.0-rc.1

package/ReactCommon/react/bridging/tests/BridgingTest.h

@@ -0,0 +1,77 @@
+/*
+ * 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.
+ */
+
+#pragma once
+
+#include <gtest/gtest.h>
+#include <hermes/hermes.h>
+#include <react/bridging/Bridging.h>
+
+#define EXPECT_JSI_THROW(expr) EXPECT_THROW((expr), facebook::jsi::JSIException)
+
+namespace facebook::react {
+
+class TestCallInvoker : public CallInvoker {
+ public:
+  void invokeAsync(std::function<void()> &&fn) override {
+    queue_.push_back(std::move(fn));
+  }
+
+  void invokeSync(std::function<void()> &&) override {
+    FAIL() << "JSCallInvoker does not support invokeSync()";
+  }
+
+ private:
+  friend class BridgingTest;
+
+  std::list<std::function<void()>> queue_;
+};
+
+class BridgingTest : public ::testing::Test {
+ protected:
+  BridgingTest()
+      : invoker(std::make_shared<TestCallInvoker>()),
+        runtime(hermes::makeHermesRuntime(
+            ::hermes::vm::RuntimeConfig::Builder()
+                // Make promises work with Hermes microtasks.
+                .withVMExperimentFlags(1 << 14 /* JobQueue */)
+                .build())),
+        rt(*runtime) {}
+
+  ~BridgingTest() {
+    LongLivedObjectCollection::get().clear();
+  }
+
+  void TearDown() override {
+    flushQueue();
+
+    // After flushing the invoker queue, we shouldn't leak memory.
+    EXPECT_EQ(0, LongLivedObjectCollection::get().size());
+  }
+
+  jsi::Value eval(const std::string &js) {
+    return rt.global().getPropertyAsFunction(rt, "eval").call(rt, js);
+  }
+
+  jsi::Function function(const std::string &js) {
+    return eval(("(" + js + ")").c_str()).getObject(rt).getFunction(rt);
+  }
+
+  void flushQueue() {
+    while (!invoker->queue_.empty()) {
+      invoker->queue_.front()();
+      invoker->queue_.pop_front();
+      rt.drainMicrotasks(); // Run microtasks every cycle.
+    }
+  }
+
+  std::shared_ptr<TestCallInvoker> invoker;
+  std::unique_ptr<jsi::Runtime> runtime;
+  jsi::Runtime &rt;
+};
+
+} // namespace facebook::react

package/ReactCommon/react/bridging/tests/ClassTest.cpp

@@ -0,0 +1,97 @@
+/*
+ * 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.
+ */
+
+#include "BridgingTest.h"
+
+namespace facebook::react {
+
+using namespace std::literals;
+
+struct TestClass {
+  TestClass(std::shared_ptr<CallInvoker> invoker) : invoker_(invoker) {}
+
+  double add(jsi::Runtime &, int a, float b) {
+    return a + b;
+  }
+
+  jsi::Object getObject(jsi::Runtime &, jsi::Object obj) {
+    return obj;
+  }
+
+  AsyncPromise<std::string> getPromise(jsi::Runtime &rt, std::string result) {
+    auto promise = AsyncPromise<std::string>(rt, invoker_);
+    promise.resolve(result);
+    return promise;
+  }
+
+  std::string
+  callFunc(jsi::Runtime &, SyncCallback<std::string(int)> func, int num) {
+    return func(num);
+  }
+
+  void callAsync(jsi::Runtime &, AsyncCallback<> callback) {
+    callback();
+  }
+
+ private:
+  std::shared_ptr<CallInvoker> invoker_;
+};
+
+TEST_F(BridgingTest, callFromJsTest) {
+  auto instance = TestClass(invoker);
+
+  EXPECT_EQ(
+      3.0,
+      bridging::callFromJs<double>(
+          rt, &TestClass::add, invoker, &instance, 1, 2.0));
+
+  auto object = jsi::Object(rt);
+
+  EXPECT_TRUE(jsi::Object::strictEquals(
+      rt,
+      object,
+      bridging::callFromJs<jsi::Object>(
+          rt, &TestClass::getObject, invoker, &instance, object)));
+
+  auto promise = bridging::callFromJs<jsi::Object>(
+      rt,
+      &TestClass::getPromise,
+      invoker,
+      &instance,
+      jsi::String::createFromAscii(rt, "hi"));
+  auto then = promise.getPropertyAsFunction(rt, "then");
+
+  std::string result;
+  then.callWithThis(
+      rt,
+      promise,
+      bridging::toJs(
+          rt, [&](std::string res) { result = res; }, invoker));
+
+  flushQueue();
+  EXPECT_EQ("hi"s, result);
+
+  auto func = function("(num) => String(num)");
+
+  EXPECT_EQ(
+      "1"s,
+      bridging::callFromJs<jsi::String>(
+          rt, &TestClass::callFunc, invoker, &instance, func, 1)
+          .utf8(rt));
+
+  bool called = false;
+  func = bridging::toJs(
+      rt, [&] { called = true; }, invoker);
+
+  bridging::callFromJs<void>(
+      rt, &TestClass::callAsync, invoker, &instance, func);
+
+  flushQueue();
+  EXPECT_TRUE(called);
+}
+
+} // namespace facebook::react

package/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)/../../

package/ReactCommon/react/config/BUCK

@@ -23,7 +23,10 @@ rn_xplat_cxx_library(
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     platforms = (ANDROID, APPLE, CXX),
     preprocessor_flags = [
         "-DLOG_TAG=\"ReactNative\"",

package/ReactCommon/react/config/CMakeLists.txt

@@ -0,0 +1,19 @@
+# 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
+        -frtti
+        -std=c++17
+        -Wall
+        -DLOG_TAG=\"Fabric\")
+
+file(GLOB react_config_SRC CONFIGURE_DEPENDS *.cpp)
+add_library(react_config SHARED ${react_config_SRC})
+
+target_include_directories(react_config PUBLIC ${REACT_COMMON_DIR})

package/ReactCommon/react/debug/Android.mk

@@ -12,10 +12,11 @@ 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)/../../../
 
-LOCAL_SHARED_LIBRARIES := libfolly_json
+LOCAL_SHARED_LIBRARIES := libfolly_runtime
 
 LOCAL_LDLIBS := -llog
 

package/ReactCommon/react/debug/BUCK

@@ -42,7 +42,10 @@ rn_xplat_cxx_library(
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
     preprocessor_flags = [

package/ReactCommon/react/debug/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)
+
+add_compile_options(
+        -fexceptions
+        -frtti
+        -std=c++17
+        -Wall
+        -DLOG_TAG=\"Fabric\")
+
+
+file(GLOB react_debug_SRC CONFIGURE_DEPENDS *.cpp)
+add_library(react_debug SHARED ${react_debug_SRC})
+
+target_include_directories(react_debug PUBLIC ${REACT_COMMON_DIR})
+
+target_link_libraries(react_debug log folly_runtime)

package/ReactCommon/react/debug/react_native_assert.h

@@ -55,7 +55,7 @@ void react_native_assert_fail(
 #define react_native_assert(cond)                           \
   if (!(cond)) {                                            \
     LOG(ERROR) << "react_native_assert failure: " << #cond; \
-    google::FlushLogFiles(google::INFO);                    \
+    google::FlushLogFiles(google::GLOG_INFO);               \
     assert(cond);                                           \
   }
 

package/ReactCommon/react/nativemodule/core/Android.mk

@@ -9,20 +9,23 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := react_nativemodule_core
 
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../ $(LOCAL_PATH)/ReactCommon $(LOCAL_PATH)/platform/android/ReactCommon
+LOCAL_C_INCLUDES := $(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/
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../ $(LOCAL_PATH) $(LOCAL_PATH)/platform/android/
 
 LOCAL_SHARED_LIBRARIES := \
   libfbjni \
-  libfolly_json \
+  libfolly_runtime \
   libjsi \
   libreact_debug \
   libreactnativejni
 
-LOCAL_STATIC_LIBRARIES :=  libreactperflogger
+LOCAL_STATIC_LIBRARIES := \
+  libreact_bridging \
+  libreactperflogger
 
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"ReactNative\"
@@ -34,3 +37,4 @@ include $(BUILD_SHARED_LIBRARY)
 $(call import-module,folly)
 $(call import-module,jsi)
 $(call import-module,reactperflogger)
+$(call import-module,react/bridging)

package/ReactCommon/react/nativemodule/core/BUCK

@@ -55,7 +55,10 @@ rn_xplat_cxx_library(
             "platform/ios/**/*.mm",
         ],
     ),
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     platforms = (ANDROID, APPLE),
     preprocessor_flags = [
         "-DLOG_TAG=\"ReactNative\"",
@@ -78,6 +81,7 @@ rn_xplat_cxx_library(
         react_native_xplat_target("reactperflogger:reactperflogger"),
     ],
     exported_deps = [
+        react_native_xplat_target("react/bridging:bridging"),
         react_native_xplat_shared_library_target("jsi:jsi"),
     ],
 )

package/ReactCommon/react/nativemodule/core/CMakeLists.txt

@@ -0,0 +1,32 @@
+# 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 -frtti -std=c++17 -Wall -DLOG_TAG=\"ReactNative\")
+
+
+file(GLOB react_nativemodule_core_SRC CONFIGURE_DEPENDS
+        ReactCommon/*.cpp
+        platform/android/ReactCommon/*.cpp)
+add_library(react_nativemodule_core
+        SHARED
+        ${react_nativemodule_core_SRC})
+
+target_include_directories(react_nativemodule_core
+        PUBLIC
+          ${CMAKE_CURRENT_SOURCE_DIR}
+          ${CMAKE_CURRENT_SOURCE_DIR}/platform/android/
+        )
+
+target_link_libraries(react_nativemodule_core
+        fbjni
+        folly_runtime
+        jsi
+        react_bridging
+        react_debug
+        reactperflogger
+        reactnativejni)

package/ReactCommon/react/nativemodule/core/ReactCommon/LongLivedObject.h

@@ -7,51 +7,5 @@
 
 #pragma once
 
-#include <memory>
-#include <mutex>
-#include <unordered_set>
-
-namespace facebook {
-namespace react {
-
-/**
- * A simple wrapper class that can be registered to a collection that keep it
- * alive for extended period of time. This object can be removed from the
- * collection when needed.
- *
- * The subclass of this class must be created using std::make_shared<T>().
- * After creation, add it to the `LongLivedObjectCollection`.
- * When done with the object, call `allowRelease()` to allow the OS to release
- * it.
- */
-class LongLivedObject {
- public:
-  virtual void allowRelease();
-
- protected:
-  LongLivedObject();
-  virtual ~LongLivedObject();
-};
-
-/**
- * A singleton, thread-safe, write-only collection for the `LongLivedObject`s.
- */
-class LongLivedObjectCollection {
- public:
-  static LongLivedObjectCollection &get();
-
-  LongLivedObjectCollection();
-  LongLivedObjectCollection(LongLivedObjectCollection const &) = delete;
-  void operator=(LongLivedObjectCollection const &) = delete;
-
-  void add(std::shared_ptr<LongLivedObject> o) const;
-  void remove(const LongLivedObject *o) const;
-  void clear() const;
-
- private:
-  mutable std::unordered_set<std::shared_ptr<LongLivedObject>> collection_;
-  mutable std::mutex collectionMutex_;
-};
-
-} // namespace react
-} // namespace facebook
+// This header is left here for compatibility reasons.
+#include <react/bridging/LongLivedObject.h>

package/ReactCommon/react/nativemodule/core/ReactCommon/TurboModule.cpp

@@ -17,28 +17,5 @@ TurboModule::TurboModule(
     std::shared_ptr<CallInvoker> jsInvoker)
     : name_(name), jsInvoker_(jsInvoker) {}
 
-TurboModule::~TurboModule() {}
-
-jsi::Value TurboModule::get(
-    jsi::Runtime &runtime,
-    const jsi::PropNameID &propName) {
-  std::string propNameUtf8 = propName.utf8(runtime);
-  auto p = methodMap_.find(propNameUtf8);
-  if (p == methodMap_.end()) {
-    // Method was not found, let JS decide what to do.
-    return jsi::Value::undefined();
-  }
-  MethodMetadata meta = p->second;
-  return jsi::Function::createFromHostFunction(
-      runtime,
-      propName,
-      static_cast<unsigned int>(meta.argCount),
-      [this, meta](
-          facebook::jsi::Runtime &rt,
-          const facebook::jsi::Value &thisVal,
-          const facebook::jsi::Value *args,
-          size_t count) { return meta.invoker(rt, *this, args, count); });
-}
-
 } // namespace react
 } // namespace facebook

package/ReactCommon/react/nativemodule/core/ReactCommon/TurboModule.h

@@ -38,11 +38,27 @@ enum TurboModuleMethodValueKind {
 class JSI_EXPORT TurboModule : public facebook::jsi::HostObject {
  public:
   TurboModule(const std::string &name, std::shared_ptr<CallInvoker> jsInvoker);
-  virtual ~TurboModule();
 
   virtual facebook::jsi::Value get(
       facebook::jsi::Runtime &runtime,
-      const facebook::jsi::PropNameID &propName) override;
+      const facebook::jsi::PropNameID &propName) override {
+    std::string propNameUtf8 = propName.utf8(runtime);
+    auto p = methodMap_.find(propNameUtf8);
+    if (p == methodMap_.end()) {
+      // Method was not found, let JS decide what to do.
+      return jsi::Value::undefined();
+    }
+    MethodMetadata meta = p->second;
+    return jsi::Function::createFromHostFunction(
+        runtime,
+        propName,
+        static_cast<unsigned int>(meta.argCount),
+        [this, meta](
+            facebook::jsi::Runtime &rt,
+            const facebook::jsi::Value &thisVal,
+            const facebook::jsi::Value *args,
+            size_t count) { return meta.invoker(rt, *this, args, count); });
+  }
 
   const std::string name_;
   std::shared_ptr<CallInvoker> jsInvoker_;

package/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleUtils.h

@@ -13,9 +13,8 @@
 #include <jsi/jsi.h>
 
 #include <ReactCommon/CallInvoker.h>
-#include <ReactCommon/LongLivedObject.h>
-
-using namespace facebook;
+#include <react/bridging/CallbackWrapper.h>
+#include <react/bridging/LongLivedObject.h>
 
 namespace facebook {
 namespace react {
@@ -40,86 +39,6 @@ jsi::Value createPromiseAsJSIValue(
     jsi::Runtime &rt,
     const PromiseSetupFunctionType func);
 
-// Helper for passing jsi::Function arg to other methods.
-class CallbackWrapper : public LongLivedObject {
- private:
-  CallbackWrapper(
-      jsi::Function &&callback,
-      jsi::Runtime &runtime,
-      std::shared_ptr<CallInvoker> jsInvoker)
-      : longLivedObjectCollection_(),
-        callback_(std::move(callback)),
-        runtime_(runtime),
-        jsInvoker_(std::move(jsInvoker)) {}
-
-  CallbackWrapper(
-      std::shared_ptr<LongLivedObjectCollection> longLivedObjectCollection,
-      jsi::Function &&callback,
-      jsi::Runtime &runtime,
-      std::shared_ptr<CallInvoker> jsInvoker)
-      : longLivedObjectCollection_(longLivedObjectCollection),
-        callback_(std::move(callback)),
-        runtime_(runtime),
-        jsInvoker_(std::move(jsInvoker)) {}
-
-  // Use a weak_ptr to avoid a retain cycle: LongLivedObjectCollection owns all
-  // CallbackWrappers. So, CallbackWrapper cannot own its
-  // LongLivedObjectCollection.
-  std::weak_ptr<LongLivedObjectCollection> longLivedObjectCollection_;
-  jsi::Function callback_;
-  jsi::Runtime &runtime_;
-  std::shared_ptr<CallInvoker> jsInvoker_;
-
- public:
-  static std::weak_ptr<CallbackWrapper> createWeak(
-      jsi::Function &&callback,
-      jsi::Runtime &runtime,
-      std::shared_ptr<CallInvoker> jsInvoker) {
-    auto wrapper = std::shared_ptr<CallbackWrapper>(
-        new CallbackWrapper(std::move(callback), runtime, jsInvoker));
-    LongLivedObjectCollection::get().add(wrapper);
-    return wrapper;
-  }
-
-  static std::weak_ptr<CallbackWrapper> createWeak(
-      std::shared_ptr<LongLivedObjectCollection> longLivedObjectCollection,
-      jsi::Function &&callback,
-      jsi::Runtime &runtime,
-      std::shared_ptr<CallInvoker> jsInvoker) {
-    auto wrapper = std::shared_ptr<CallbackWrapper>(new CallbackWrapper(
-        longLivedObjectCollection, std::move(callback), runtime, jsInvoker));
-    longLivedObjectCollection->add(wrapper);
-    return wrapper;
-  }
-
-  // Delete the enclosed jsi::Function
-  void destroy() {
-    allowRelease();
-  }
-
-  jsi::Function &callback() {
-    return callback_;
-  }
-
-  jsi::Runtime &runtime() {
-    return runtime_;
-  }
-
-  CallInvoker &jsInvoker() {
-    return *(jsInvoker_);
-  }
-
-  void allowRelease() override {
-    if (auto longLivedObjectCollection = longLivedObjectCollection_.lock()) {
-      if (longLivedObjectCollection != nullptr) {
-        longLivedObjectCollection->remove(this);
-        return;
-      }
-    }
-    LongLivedObject::allowRelease();
-  }
-};
-
 class RAIICallbackWrapperDestroyer {
  public:
   RAIICallbackWrapperDestroyer(std::weak_ptr<CallbackWrapper> callbackWrapper)

package/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModule.mm

@@ -27,6 +27,7 @@
 #import <ReactCommon/TurboModulePerfLogger.h>
 #import <ReactCommon/TurboModuleUtils.h>
 
+using namespace facebook;
 using namespace facebook::react;
 
 static int32_t getUniqueId()
@@ -625,7 +626,8 @@ NSInvocation *ObjCTurboModule::getMethodInvocation(
       if ([objCArg isKindOfClass:[NSDictionary class]] && hasMethodArgConversionSelector(methodNameNSString, i)) {
         SEL methodArgConversionSelector = getMethodArgConversionSelector(methodNameNSString, i);
 
-        // Message dispatch logic from old infra (link: https://git.io/fjf3U)
+        // Message dispatch logic from old infra (link:
+        // https://github.com/facebook/react-native/commit/6783694158057662fd7b11fc123c339b2b21bfe6#diff-263fc157dfce55895cdc16495b55d190R350)
         RCTManagedPointer *(*convert)(id, SEL, id) = (__typeof__(convert))objc_msgSend;
         RCTManagedPointer *box = convert([RCTCxxConvert class], methodArgConversionSelector, objCArg);
 

package/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModuleManager.mm

@@ -28,6 +28,7 @@
 #import <ReactCommon/TurboModuleBinding.h>
 #import <ReactCommon/TurboModulePerfLogger.h>
 
+using namespace facebook;
 using namespace facebook::react;
 
 /**
@@ -520,6 +521,19 @@ static Class getFallbackClassFromName(const char *name)
       std::lock_guard<std::mutex> delegateGuard(_turboModuleManagerDelegateMutex);
       module = [_delegate getModuleInstanceFromClass:moduleClass];
     }
+
+    /**
+     * If the application is unable to create the TurboModule object from its class:
+     * abort TurboModule creation, and early return nil.
+     */
+    if (!module) {
+      RCTLogError(
+          @"TurboModuleManager delegate %@ returned nil TurboModule object for module with name=\"%s\" and class=%@",
+          NSStringFromClass([_delegate class]),
+          moduleName,
+          NSStringFromClass(moduleClass));
+      return nil;
+    }
   } else {
     module = [moduleClass new];
   }
@@ -702,18 +716,14 @@ static Class getFallbackClassFromName(const char *name)
 
   BOOL requiresMainQueueSetup = hasConstantsToExport || hasCustomInit;
   if (requiresMainQueueSetup) {
-    const char *methodName = "";
-    if (hasConstantsToExport) {
-      methodName = "constantsToExport";
-    } else if (hasCustomInit) {
-      methodName = "init";
-    }
     RCTLogWarn(
         @"Module %@ requires main queue setup since it overrides `%s` but doesn't implement "
          "`requiresMainQueueSetup`. In a future release React Native will default to initializing all native modules "
          "on a background thread unless explicitly opted-out of.",
         moduleClass,
-        methodName);
+        hasConstantsToExport ? "constantsToExport"
+            : hasCustomInit  ? "init"
+                             : "");
   }
 
   return requiresMainQueueSetup;

package/ReactCommon/react/nativemodule/samples/BUCK

@@ -56,7 +56,10 @@ rn_xplat_cxx_library(
             "platform/ios/**/*.mm",
         ],
     ),
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     platforms = (ANDROID, APPLE),
     preprocessor_flags = [
         "-DLOG_TAG=\"ReactNative\"",

package/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 \