react-native 0.68.2 → 0.69.0-rc.2

package/ReactAndroid/hermes-engine/build.gradle

@@ -0,0 +1,261 @@
+/*
+ * 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.
+ */
+
+import org.apache.tools.ant.taskdefs.condition.Os
+
+plugins {
+    id("de.undercouch.download")
+    id("com.android.library")
+    id("maven-publish")
+}
+
+group = "com.facebook.react"
+version = parent.publishing_version
+
+def cmakeVersion = "3.18.1"
+/**
+ * We use the bundled version of CMake in the Android SDK if available, to don't force Android
+ * users to install CMake externally.
+ */
+def findCmakePath(cmakeVersion) {
+    if (System.getenv("ANDROID_SDK_ROOT")) {
+        return "${System.getenv("ANDROID_SDK_ROOT")}/cmake/${cmakeVersion}/bin/cmake"
+    }
+    if (System.getenv("ANDROID_HOME")) {
+        return "${System.getenv("ANDROID_HOME")}/cmake/${cmakeVersion}/bin/cmake"
+    }
+    return "cmake"
+}
+
+def reactNativeRootDir = project(':ReactAndroid').projectDir.parent;
+def customDownloadDir = System.getenv("REACT_NATIVE_DOWNLOADS_DIR")
+def downloadsDir = customDownloadDir ? new File(customDownloadDir) : new File(reactNativeRootDir, "sdks/download")
+
+// By default we are going to download and unzip hermes inside the /sdks/hermes folder
+// but you can provide an override for where the hermes source code is located.
+def overrideHermesDir = System.getenv("REACT_NATIVE_OVERRIDE_HERMES_DIR") != null
+def hermesDir = System.getenv("REACT_NATIVE_OVERRIDE_HERMES_DIR") ?: new File(reactNativeRootDir, "sdks/hermes")
+def hermesBuildDir = new File("$buildDir/hermes")
+
+def hermesVersion = "main"
+def hermesVersionFile = new File(reactNativeRootDir, "sdks/.hermesversion")
+if (hermesVersionFile.exists()) {
+    hermesVersion = hermesVersionFile.text
+}
+def ndkBuildJobs = Runtime.runtime.availableProcessors().toString()
+def prefabHeadersDir = new File("$buildDir/prefab-headers")
+
+// By setting REACT_NATIVE_HERMES_SKIP_PREFAB you can skip prefab publishing, to
+// reduce the size of the Hermes published .AAR.
+def skipPrefabPublishing = System.getenv("REACT_NATIVE_HERMES_SKIP_PREFAB") != null
+
+// We inject the JSI directory used inside the Hermes build with the -DJSI_DIR config.
+def jsiDir = new File(reactNativeRootDir, "ReactCommon/jsi")
+
+// The .aar is placed inside the ./android folder at the top level.
+// There it will be placed alongside the React Android .aar
+def AAR_OUTPUT_URL = "file://${rootDir}/android"
+
+task downloadHermes(type: Download) {
+    src("https://github.com/facebook/hermes/tarball/${hermesVersion}")
+    onlyIfNewer(true)
+    overwrite(false)
+    dest(new File(downloadsDir, "hermes.tar.gz"))
+}
+
+task installArchives {
+    dependsOn("publishAllPublicationsToNpmRepository")
+}
+
+task unzipHermes(dependsOn: downloadHermes, type: Copy) {
+    from(tarTree(downloadHermes.dest)) {
+        eachFile { file ->
+            // We flatten the unzip as the tarball contains a `facebook-hermes-<SHA>`
+            // folder at the top level.
+            if (file.relativePath.segments.size() > 1) {
+                file.relativePath = new org.gradle.api.file.RelativePath(!file.isDirectory(), file.relativePath.segments.drop(1))
+            }
+        }
+    }
+    into(hermesDir)
+}
+
+task configureBuildForHermes(type: Exec) {
+    workingDir(hermesDir)
+    commandLine(windowsAwareCommandLine(findCmakePath(cmakeVersion), "-S", ".", "-B", hermesBuildDir.toString(), "-DJSI_DIR=" + jsiDir.absolutePath))
+}
+
+task buildHermes(dependsOn: configureBuildForHermes, type: Exec) {
+    workingDir(hermesDir)
+    commandLine(windowsAwareCommandLine(findCmakePath(cmakeVersion), "--build", hermesBuildDir.toString(), "--target", "hermesc", "-j", ndkBuildJobs))
+}
+
+task prepareHeadersForPrefab(type: Copy) {
+    from("$hermesDir/API")
+    from("$hermesDir/public")
+    include("**/*.h")
+    exclude("jsi/**")
+    into(prefabHeadersDir)
+}
+
+static def windowsAwareCommandLine(String... commands) {
+    def newCommands = []
+    if (Os.isFamily(Os.FAMILY_WINDOWS)) {
+        newCommands = ['cmd', '/c']
+    }
+    newCommands.addAll(commands)
+    return newCommands
+}
+
+def reactNativeArchitectures() {
+    def value = project.getProperties().get("reactNativeArchitectures")
+    return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
+}
+
+android {
+    compileSdkVersion 31
+    buildToolsVersion = "31.0.0"
+
+    // Used to override the NDK path/version on internal CI or by allowing
+    // users to customize the NDK path/version from their root project (e.g. for M1 support)
+    if (rootProject.hasProperty("ndkPath")) {
+        ndkPath rootProject.ext.ndkPath
+    }
+    if (rootProject.hasProperty("ndkVersion")) {
+        ndkVersion rootProject.ext.ndkVersion
+    }
+
+    defaultConfig {
+        minSdkVersion 21
+
+        externalNativeBuild {
+            cmake {
+                arguments "-DHERMES_IS_ANDROID=True"
+                arguments "-DANDROID_STL=c++_shared"
+                arguments "-DANDROID_PIE=True"
+                arguments "-DANDROID_LD=lld"
+                arguments "-DIMPORT_HERMESC=${new File(hermesBuildDir, "ImportHermesc.cmake").toString()}"
+                arguments "-DJSI_DIR=${jsiDir}"
+                arguments "-DHERMES_SLOW_DEBUG=False"
+                arguments "-DHERMES_BUILD_SHARED_JSI=True"
+                arguments "-DHERMES_RELEASE_VERSION=for RN ${version}"
+                // We intentionally build Hermes with Intl support only. This is to simplify
+                // the build setup and to avoid overcomplicating the build-type matrix.
+                arguments "-DHERMES_ENABLE_INTL=True"
+                targets "libhermes"
+            }
+        }
+        ndk {
+            abiFilters (*reactNativeArchitectures())
+        }
+    }
+
+    externalNativeBuild {
+        cmake {
+            version cmakeVersion
+            path "$hermesDir/CMakeLists.txt"
+        }
+    }
+
+    buildTypes {
+        debug {
+            externalNativeBuild {
+                cmake {
+                    // JS developers aren't VM developers.
+                    // Therefore we're passing as build type Release, to provide a faster build.
+                    // This has the (unlucky) side effect of letting AGP call the build
+                    // tasks `configureCMakeRelease` while is actually building the debug flavor.
+                    arguments "-DCMAKE_BUILD_TYPE=Release"
+                }
+            }
+        }
+        release {
+            externalNativeBuild {
+                cmake {
+                    arguments "-DHERMES_ENABLE_DEBUGGER=False"
+                    arguments "-DCMAKE_BUILD_TYPE=MinSizeRel"
+                }
+            }
+        }
+    }
+
+    sourceSets {
+        main {
+            manifest.srcFile "$hermesDir/android/hermes/src/main/AndroidManifest.xml"
+            java.srcDirs = [
+                "$hermesDir/lib/Platform/Intl/java"
+            ]
+        }
+    }
+
+    buildFeatures {
+        prefab true
+        prefabPublishing !skipPrefabPublishing
+    }
+
+    dependencies {
+        implementation("com.facebook.fbjni:fbjni:0.2.2")
+        implementation("com.facebook.soloader:soloader:0.10.3")
+        implementation("com.facebook.yoga:proguard-annotations:1.19.0")
+        implementation("androidx.annotation:annotation:1.3.0")
+    }
+
+    packagingOptions {
+        exclude "**/libc++_shared.so"
+        exclude "**/libjsi.so"
+        exclude "**/libfbjni.so"
+    }
+
+    publishing {
+        multipleVariants {
+            withSourcesJar()
+            withJavadocJar()
+            allVariants()
+        }
+    }
+
+    prefab {
+        libhermes {
+            headers prefabHeadersDir.absolutePath
+            libraryName "libhermes"
+        }
+    }
+}
+
+afterEvaluate {
+    if (!overrideHermesDir) {
+        // If you're not specifying a Hermes Path override, we want to
+        // download/unzip Hermes from Github then.
+        configureBuildForHermes.dependsOn(unzipHermes)
+        prepareHeadersForPrefab.dependsOn(unzipHermes)
+    }
+    preBuild.dependsOn(buildHermes)
+    preBuild.dependsOn(prepareHeadersForPrefab)
+    // Needed as some of the native sources needs to be downloaded
+    // before configureCMakeRelease/configureCMakeMinSizeRel could be executed.
+    reactNativeArchitectures().each { architecture ->
+        tasks.findByName("configureCMakeMinSizeRel[${architecture}]")?.configure { dependsOn(preBuild) }
+        tasks.findByName("configureCMakeRelease[${architecture}]")?.configure { dependsOn(preBuild) }
+    }
+    configureCMakeRelease.dependsOn(preBuild)
+    configureCMakeMinSizeRel.dependsOn(preBuild)
+
+    publishing {
+        publications {
+            release(MavenPublication) {
+                from components.default
+                artifactId = "hermes-engine"
+            }
+        }
+        repositories {
+            maven {
+                name = "npm"
+                url = AAR_OUTPUT_URL
+            }
+        }
+    }
+}

package/ReactAndroid/hermes-engine/gradle.properties

@@ -0,0 +1 @@
+android.disableAutomaticComponentCreation=true

package/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java

@@ -214,6 +214,10 @@ public class ReactAppTestActivity extends FragmentActivity
     if (spec.getJavaScriptExecutorFactory() != null) {
       builder.setJavaScriptExecutorFactory(spec.getJavaScriptExecutorFactory());
     }
+    if (spec.getReactPackageTurboModuleManagerDelegateBuilder() != null) {
+      builder.setReactPackageTurboModuleManagerDelegateBuilder(
+          spec.getReactPackageTurboModuleManagerDelegateBuilder());
+    }
     if (spec.getNativeModuleCallExceptionHandler() != null) {
       builder.setNativeModuleCallExceptionHandler(spec.getNativeModuleCallExceptionHandler());
     }

package/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactInstanceSpecForTest.java

@@ -10,6 +10,7 @@ package com.facebook.react.testing;
 import android.annotation.SuppressLint;
 import androidx.annotation.Nullable;
 import com.facebook.react.ReactPackage;
+import com.facebook.react.ReactPackageTurboModuleManagerDelegate;
 import com.facebook.react.bridge.JavaScriptExecutorFactory;
 import com.facebook.react.bridge.JavaScriptModule;
 import com.facebook.react.bridge.NativeModule;
@@ -35,6 +36,7 @@ public class ReactInstanceSpecForTest {
   @Nullable private NativeModuleCallExceptionHandler mNativeModuleCallExceptionHandler = null;
   @Nullable private FabricUIManagerFactory mFabricUIManagerFactory = null;
   @Nullable private JavaScriptExecutorFactory mJavaScriptExecutorFactory = null;
+  @Nullable private ReactPackageTurboModuleManagerDelegate.Builder mTMMDelegateBuilder = null;
 
   public ReactInstanceSpecForTest addNativeModule(NativeModule module) {
     mNativeModules.add(module);
@@ -77,6 +79,17 @@ public class ReactInstanceSpecForTest {
     return mFabricUIManagerFactory;
   }
 
+  public ReactInstanceSpecForTest setReactPackageTurboModuleManagerDelegateBuilder(
+      @Nullable ReactPackageTurboModuleManagerDelegate.Builder builder) {
+    mTMMDelegateBuilder = builder;
+    return this;
+  }
+
+  protected @Nullable ReactPackageTurboModuleManagerDelegate.Builder
+      getReactPackageTurboModuleManagerDelegateBuilder() {
+    return mTMMDelegateBuilder;
+  }
+
   public ReactInstanceSpecForTest addPackages(List<ReactPackage> reactPackages) {
     mReactPackages.addAll(reactPackages);
     return this;

package/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactInstrumentationTest.java

@@ -12,6 +12,7 @@ import android.test.ActivityInstrumentationTestCase2;
 import android.view.View;
 import android.view.ViewGroup;
 import androidx.annotation.Nullable;
+import com.facebook.react.ReactPackageTurboModuleManagerDelegate;
 import com.facebook.react.bridge.JavaScriptExecutorFactory;
 import com.facebook.react.bridge.JavaScriptModule;
 import com.facebook.react.bridge.ReactContext;
@@ -95,6 +96,11 @@ public abstract class ReactInstrumentationTest
     return getReactContext().getJSModule(jsInterface);
   }
 
+  protected @Nullable ReactPackageTurboModuleManagerDelegate.Builder
+      getReactPackageTurboModuleManagerDelegateBuilder() {
+    return null;
+  }
+
   /** Override this method to provide extra native modules to be loaded before the app starts */
   protected ReactInstanceSpecForTest createReactInstanceSpecForTest() {
     ReactInstanceSpecForTest reactInstanceSpecForTest =
@@ -105,6 +111,8 @@ public abstract class ReactInstrumentationTest
     if (mFabricUIManagerFactory != null) {
       reactInstanceSpecForTest.setFabricUIManagerFactory(mFabricUIManagerFactory);
     }
+    reactInstanceSpecForTest.setReactPackageTurboModuleManagerDelegateBuilder(
+        getReactPackageTurboModuleManagerDelegateBuilder());
     return reactInstanceSpecForTest;
   }
 

package/ReactAndroid/src/androidTest/java/com/facebook/react/testing/network/BUCK

@@ -4,7 +4,10 @@ rn_android_library(
     name = "network",
     srcs = glob(["**/*.java"]),
     autoglob = False,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     visibility = [
         "PUBLIC",
     ],

package/ReactAndroid/src/androidTest/js/BUCK

@@ -16,7 +16,10 @@ rn_library(
             "**/*.md",
         ],
     ),
-    labels = ["supermodule:xplat/default/public.react_native.tests"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.tests",
+    ],
     skip_processors = True,
     visibility = ["PUBLIC"],
     deps = [

package/ReactAndroid/src/main/java/com/facebook/debug/holder/BUCK

@@ -4,7 +4,10 @@ rn_android_library(
     name = "holder",
     srcs = glob(["*.java"]),
     autoglob = False,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     visibility = [
         "PUBLIC",
     ],

package/ReactAndroid/src/main/java/com/facebook/debug/tags/BUCK

@@ -4,7 +4,10 @@ rn_android_library(
     name = "tags",
     srcs = glob(["*.java"]),
     autoglob = False,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     visibility = [
         "PUBLIC",
     ],

package/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/Android.mk

@@ -7,7 +7,6 @@
 LOCAL_PATH := $(call my-dir)
 REACT_NATIVE := $(LOCAL_PATH)/../../../../../../../..
 
-include $(REACT_NATIVE)/ReactCommon/common.mk
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := jsijniprofiler
@@ -15,7 +14,7 @@ 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
+LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi
 
 LOCAL_CPP_FEATURES := exceptions
 
@@ -23,12 +22,10 @@ LOCAL_STATIC_LIBRARIES := libjsireact
 LOCAL_SHARED_LIBRARIES := \
   libfb \
   libfbjni \
-  libfolly_json \
+  libfolly_runtime \
   libhermes \
   libjsi \
   libreactnativejni
 
 include $(BUILD_SHARED_LIBRARY)
 
-
-include $(CLEAR_VARS)

package/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/BUCK

@@ -13,7 +13,10 @@ rn_android_library(
     name = "hermes_samplingprofiler",
     srcs = ["HermesSamplingProfiler.java"],
     autoglob = False,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     visibility = ["PUBLIC"],
     deps = [
         react_native_dep("java/com/facebook/proguard/annotations:annotations"),
@@ -34,7 +37,10 @@ rn_xplat_cxx_library(
     compiler_flags_enable_exceptions = True,  # TODO: is this necessary?
     compiler_flags_enable_rtti = True,  # TODO: is this necessary?
     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,
     soname = "libjsijniprofiler.$(ext)",
     visibility = [

package/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/CMakeLists.txt

@@ -0,0 +1,31 @@
+# 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)
+
+file(GLOB_RECURSE jsijniprofiler_SRC CONFIGURE_DEPENDS *.cpp)
+
+add_library(
+        jsijniprofiler
+        SHARED
+        ${jsijniprofiler_SRC}
+)
+target_compile_options(
+        jsijniprofiler
+        PRIVATE
+        -fexceptions
+)
+target_include_directories(jsijniprofiler PRIVATE .)
+target_link_libraries(
+      jsijniprofiler
+      fb
+      fbjni
+      jsireact
+      folly_runtime
+      hermes-engine::libhermes
+      jsi
+      reactnativejni
+)

package/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/Android.mk

@@ -6,49 +6,50 @@
 LOCAL_PATH := $(call my-dir)
 REACT_NATIVE := $(LOCAL_PATH)/../../../../../../../..
 
-include $(REACT_NATIVE)/ReactCommon/common.mk
-include $(CLEAR_VARS)
+ifeq ($(APP_OPTIM),debug)
+  include $(CLEAR_VARS)
 
-LOCAL_MODULE := hermes-executor-release
+  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_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_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi
 
-LOCAL_CPP_FEATURES := exceptions
+  LOCAL_CPP_FEATURES := exceptions
 
-LOCAL_STATIC_LIBRARIES := libjsireact libhermes-executor-common-release
-LOCAL_SHARED_LIBRARIES := \
-  libfb \
-  libfbjni \
-  libfolly_json \
-  libhermes \
-  libjsi \
-  libreactnativejni
+  LOCAL_STATIC_LIBRARIES := libjsireact libhermes-executor-common-debug
+  LOCAL_SHARED_LIBRARIES := \
+    libfb \
+    libfbjni \
+    libfolly_runtime \
+    libhermes \
+    libjsi \
+    libreactnativejni
 
-include $(BUILD_SHARED_LIBRARY)
+  include $(BUILD_SHARED_LIBRARY)
+else
+  include $(CLEAR_VARS)
 
+  LOCAL_MODULE := hermes-executor-release
 
-include $(CLEAR_VARS)
+  LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
 
-LOCAL_MODULE := hermes-executor-debug
-LOCAL_CFLAGS := -DHERMES_ENABLE_DEBUGGER=1
+  LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi
 
-LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
-LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
+  LOCAL_CPP_FEATURES := exceptions
+  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_STATIC_LIBRARIES := libjsireact libhermes-executor-common-release
+  LOCAL_SHARED_LIBRARIES := \
+    libfb \
+    libfbjni \
+    libfolly_runtime \
+    libhermes \
+    libjsi \
+    libreactnativejni
 
-LOCAL_CPP_FEATURES := exceptions
-
-LOCAL_STATIC_LIBRARIES := libjsireact libhermes-executor-common-debug
-LOCAL_SHARED_LIBRARIES := \
-  libfb \
-  libfbjni \
-  libfolly_json \
-  libhermes \
-  libjsi \
-  libreactnativejni
-
-include $(BUILD_SHARED_LIBRARY)
+  include $(BUILD_SHARED_LIBRARY)
+endif

package/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/CMakeLists.txt

@@ -0,0 +1,41 @@
+# 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)
+
+file(GLOB_RECURSE hermes_executor_SRC CONFIGURE_DEPENDS *.cpp)
+
+if(${CMAKE_BUILD_TYPE} MATCHES Debug)
+        set(HERMES_TARGET_SUFFIX debug)
+else()
+        set(HERMES_TARGET_SUFFIX release)
+endif()
+
+set(HERMES_TARGET_NAME hermes-executor-${HERMES_TARGET_SUFFIX})
+
+add_library(
+        ${HERMES_TARGET_NAME}
+        SHARED
+        ${hermes_executor_SRC}
+)
+target_compile_options(
+        ${HERMES_TARGET_NAME}
+        PRIVATE
+        $<$<CONFIG:Debug>:-DHERMES_ENABLE_DEBUGGER=1>
+        -fexceptions
+)
+target_include_directories(${HERMES_TARGET_NAME} PRIVATE .)
+target_link_libraries(
+        ${HERMES_TARGET_NAME}
+        hermes-executor-common
+        jsireact
+        fb
+        fbjni
+        folly_runtime
+        hermes-engine::libhermes
+        jsi
+        reactnativejni
+)

package/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/OnLoad.cpp

@@ -47,6 +47,7 @@ static ::hermes::vm::RuntimeConfig makeRuntimeConfig(jlong heapSizeMB) {
 
   return vm::RuntimeConfig::Builder()
       .withGCConfig(gcConfigBuilder.build())
+      .withEnableSampleProfiling(true)
       .build();
 }
 

package/ReactAndroid/src/main/java/com/facebook/react/BUCK

@@ -5,7 +5,10 @@ rn_android_library(
     srcs = glob(["*.java"]),
     autoglob = False,
     is_androidx = True,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     provided_deps = [
         react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("third-party/android/androidx:appcompat"),