react-native-tvos 0.69.8-2 → 0.71.7-0rc0

package/ReactAndroid/cmake-utils/ReactNative-application.cmake

@@ -0,0 +1,119 @@
+# 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.
+
+# This CMake file takes care of creating everything you need to build and link
+# your C++ source code in a React Native Application for Android.
+# You just need to call `project(<my_project_name>)` and import this file.
+# Specifically this file will:
+# - Take care of creating a shared library called as your project
+# - Take care of setting the correct compile options
+# - Include all the pre-built libraries in your build graph
+# - Link your library against those prebuilt libraries so you can access JSI, Fabric, etc.
+# - Link your library against any autolinked library.
+# - Make sure ccache is used as part of the compilation process, if you have it installed.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+include(${CMAKE_CURRENT_LIST_DIR}/folly-flags.cmake)
+
+# We configured the REACT_COMMON_DIR variable as it's commonly used to reference
+# shared C++ code in other targets.
+set(REACT_COMMON_DIR ${REACT_ANDROID_DIR}/../ReactCommon)
+
+# If you have ccache installed, we're going to honor it.
+find_program(CCACHE_FOUND ccache)
+if(CCACHE_FOUND)
+  set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
+  set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
+endif(CCACHE_FOUND)
+
+set(BUILD_DIR ${PROJECT_BUILD_DIR})
+if(CMAKE_HOST_WIN32)
+        string(REPLACE "\\" "/" BUILD_DIR ${BUILD_DIR})
+endif()
+
+file(GLOB input_SRC CONFIGURE_DEPENDS
+        *.cpp
+        ${BUILD_DIR}/generated/rncli/src/main/jni/*.cpp)
+
+add_library(${CMAKE_PROJECT_NAME} SHARED ${input_SRC})
+
+target_include_directories(${CMAKE_PROJECT_NAME}
+        PUBLIC
+                ${CMAKE_CURRENT_SOURCE_DIR}
+                ${PROJECT_BUILD_DIR}/generated/rncli/src/main/jni)
+
+target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE -Wall -Werror -fexceptions -frtti -std=c++17 -DWITH_INSPECTOR=1 -DLOG_TAG=\"ReactNative\")
+
+# Prefab packages from React Native
+find_package(ReactAndroid REQUIRED CONFIG)
+add_library(react_render_debug ALIAS ReactAndroid::react_render_debug)
+add_library(turbomodulejsijni ALIAS ReactAndroid::turbomodulejsijni)
+add_library(runtimeexecutor ALIAS ReactAndroid::runtimeexecutor)
+add_library(react_codegen_rncore ALIAS ReactAndroid::react_codegen_rncore)
+add_library(react_debug ALIAS ReactAndroid::react_debug)
+add_library(react_render_componentregistry ALIAS ReactAndroid::react_render_componentregistry)
+add_library(react_newarchdefaults ALIAS ReactAndroid::react_newarchdefaults)
+add_library(react_render_core ALIAS ReactAndroid::react_render_core)
+add_library(react_render_graphics ALIAS ReactAndroid::react_render_graphics)
+add_library(rrc_view ALIAS ReactAndroid::rrc_view)
+add_library(jsi ALIAS ReactAndroid::jsi)
+add_library(glog ALIAS ReactAndroid::glog)
+add_library(fabricjni ALIAS ReactAndroid::fabricjni)
+add_library(react_render_mapbuffer ALIAS ReactAndroid::react_render_mapbuffer)
+add_library(yoga ALIAS ReactAndroid::yoga)
+add_library(folly_runtime ALIAS ReactAndroid::folly_runtime)
+add_library(react_nativemodule_core ALIAS ReactAndroid::react_nativemodule_core)
+add_library(react_render_imagemanager ALIAS ReactAndroid::react_render_imagemanager)
+add_library(rrc_image ALIAS ReactAndroid::rrc_image)
+
+find_package(fbjni REQUIRED CONFIG)
+add_library(fbjni ALIAS fbjni::fbjni)
+
+target_link_libraries(${CMAKE_PROJECT_NAME}
+        fabricjni                           # prefab ready
+        fbjni                               # via 3rd party prefab
+        folly_runtime                       # prefab ready
+        glog                                # prefab ready
+        jsi                                 # prefab ready
+        react_codegen_rncore                # prefab ready
+        react_debug                         # prefab ready
+        react_nativemodule_core             # prefab ready
+        react_newarchdefaults               # prefab ready
+        react_render_componentregistry      # prefab ready
+        react_render_core                   # prefab ready
+        react_render_debug                  # prefab ready
+        react_render_graphics               # prefab ready
+        react_render_imagemanager           # prefab ready
+        react_render_mapbuffer              # prefab ready
+        rrc_image                           # prefab ready
+        rrc_view                            # prefab ready
+        runtimeexecutor                     # prefab ready
+        turbomodulejsijni                   # prefab ready
+        yoga)                               # prefab ready
+
+# We use an interface target to propagate flags to all the generated targets
+# such as the folly flags or others.
+add_library(common_flags INTERFACE)
+target_compile_options(common_flags INTERFACE ${folly_FLAGS})
+target_link_libraries(ReactAndroid::react_codegen_rncore INTERFACE common_flags)
+
+# If project is on RN CLI v9, then we can use the following lines to link against the autolinked 3rd party libraries.
+if(EXISTS ${PROJECT_BUILD_DIR}/generated/rncli/src/main/jni/Android-rncli.cmake)
+        include(${PROJECT_BUILD_DIR}/generated/rncli/src/main/jni/Android-rncli.cmake)
+        target_link_libraries(${CMAKE_PROJECT_NAME} ${AUTOLINKED_LIBRARIES})
+        foreach(autolinked_library ${AUTOLINKED_LIBRARIES})
+            target_link_libraries(${autolinked_library} common_flags)
+        endforeach()
+endif()
+
+# If project is running codegen at the app level, we want to link and build the generated library.
+if(EXISTS ${PROJECT_BUILD_DIR}/generated/source/codegen/jni/CMakeLists.txt)
+        add_subdirectory(${PROJECT_BUILD_DIR}/generated/source/codegen/jni/ codegen_app_build)
+        get_property(APP_CODEGEN_TARGET DIRECTORY ${PROJECT_BUILD_DIR}/generated/source/codegen/jni/ PROPERTY BUILDSYSTEM_TARGETS)
+        target_link_libraries(${CMAKE_PROJECT_NAME} ${APP_CODEGEN_TARGET})
+        target_link_libraries(${APP_CODEGEN_TARGET} common_flags)
+endif()

package/ReactAndroid/cmake-utils/default-app-setup/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.
+
+# This CMake file is the default used by apps and is placed inside react-native
+# to encapsulate it from user space (so you won't need to touch C++/Cmake code at all on Android).
+#
+# If you wish to customize it (because you want to manually link a C++ library or pass a custom
+# compilation flag) you can:
+#
+# 1. Copy this CMake file inside the `android/app/src/main/jni` folder of your project
+# 2. Copy the OnLoad.cpp (in this same folder) file inside the same folder as above.
+# 3. Extend your `android/app/build.gradle` as follows
+#
+# android {
+#    // Other config here...
+#    externalNativeBuild {
+#        cmake {
+#            path "src/main/jni/CMakeLists.txt"
+#        }
+#    }
+# }
+
+cmake_minimum_required(VERSION 3.13)
+
+# Define the library name here.
+project(appmodules)
+
+# This file includes all the necessary to let you build your application with the New Architecture.
+include(${REACT_ANDROID_DIR}/cmake-utils/ReactNative-application.cmake)

package/ReactAndroid/cmake-utils/default-app-setup/OnLoad.cpp

@@ -0,0 +1,88 @@
+/*
+ * 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.
+ */
+
+// This C++ file is part of the default configuration used by apps and is placed
+// inside react-native to encapsulate it from user space (so you won't need to
+// touch C++/Cmake code at all on Android).
+//
+// If you wish to customize it (because you want to manually link a C++ library
+// or pass a custom compilation flag) you can:
+//
+// 1. Copy this CMake file inside the `android/app/src/main/jni` folder of your
+// project
+// 2. Copy the OnLoad.cpp (in this same folder) file inside the same folder as
+// above.
+// 3. Extend your `android/app/build.gradle` as follows
+//
+// android {
+//    // Other config here...
+//    externalNativeBuild {
+//        cmake {
+//            path "src/main/jni/CMakeLists.txt"
+//        }
+//    }
+// }
+
+#include <DefaultComponentsRegistry.h>
+#include <DefaultTurboModuleManagerDelegate.h>
+#include <fbjni/fbjni.h>
+#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <rncli.h>
+
+namespace facebook {
+namespace react {
+
+void registerComponents(
+    std::shared_ptr<ComponentDescriptorProviderRegistry const> registry) {
+  // Custom Fabric Components go here. You can register custom
+  // components coming from your App or from 3rd party libraries here.
+  //
+  // providerRegistry->add(concreteComponentDescriptorProvider<
+  //        AocViewerComponentDescriptor>());
+
+  // By default we just use the components autolinked by RN CLI
+  rncli_registerProviders(registry);
+}
+
+std::shared_ptr<TurboModule> cxxModuleProvider(
+    const std::string &name,
+    const std::shared_ptr<CallInvoker> &jsInvoker) {
+  // Not implemented yet: provide pure-C++ NativeModules here.
+  return nullptr;
+}
+
+std::shared_ptr<TurboModule> javaModuleProvider(
+    const std::string &name,
+    const JavaTurboModule::InitParams &params) {
+  // Here you can provide your own module provider for TurboModules coming from
+  // either your application or from external libraries. The approach to follow
+  // is similar to the following (for a library called `samplelibrary`):
+  //
+  // auto module = samplelibrary_ModuleProvider(moduleName, params);
+  // if (module != nullptr) {
+  //    return module;
+  // }
+  // return rncore_ModuleProvider(moduleName, params);
+
+  // By default we just use the module providers autolinked by RN CLI
+  return rncli_ModuleProvider(name, params);
+}
+
+} // namespace react
+} // namespace facebook
+
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
+  return facebook::jni::initialize(vm, [] {
+    facebook::react::DefaultTurboModuleManagerDelegate::cxxModuleProvider =
+        &facebook::react::cxxModuleProvider;
+    facebook::react::DefaultTurboModuleManagerDelegate::javaModuleProvider =
+        &facebook::react::javaModuleProvider;
+    facebook::react::DefaultComponentsRegistry::
+        registerComponentDescriptorsFromEntryPoint =
+            &facebook::react::registerComponents;
+  });
+}

package/ReactAndroid/cmake-utils/folly-flags.cmake

@@ -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)
+
+# This CMake file exposes the Folly Flags that all the libraries should use when
+# compiling/linking against a dependency which requires folly.
+
+SET(folly_FLAGS
+        -DFOLLY_NO_CONFIG=1
+        -DFOLLY_HAVE_CLOCK_GETTIME=1
+        -DFOLLY_USE_LIBCPP=1
+        -DFOLLY_MOBILE=1
+        -DFOLLY_HAVE_RECVMMSG=1
+        -DFOLLY_HAVE_PTHREAD=1
+        # Once we target android-23 above, we can comment
+        # the following line. NDK uses GNU style stderror_r() after API 23.
+        -DFOLLY_HAVE_XSI_STRERROR_R=1
+        )

package/ReactAndroid/external-artifacts/build.gradle

@@ -0,0 +1,44 @@
+/*
+ * 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.
+ */
+
+plugins {
+    id("maven-publish")
+}
+
+// group = "com.facebook.react"
+// Group for the TV repo
+group = "io.github.react-native-tvos"
+
+version = parent.publishing_version
+configurations.maybeCreate("default")
+
+// Those artifacts should be placed inside the `artifacts/hermes-ios-*.tar.gz` location.
+def hermesiOSDebugArtifactFile = layout.projectDirectory.file('artifacts/hermes-ios-debug.tar.gz')
+def hermesiOSDebugArtifact = artifacts.add('default', hermesiOSDebugArtifactFile) {
+    type 'tgz'
+    extension 'tar.gz'
+    classifier 'hermes-ios-debug'
+}
+def hermesiOSReleaseArtifactFile = layout.projectDirectory.file('artifacts/hermes-ios-release.tar.gz')
+def hermesiOSReleaseArtifact = artifacts.add('default', hermesiOSReleaseArtifactFile) {
+    type 'tgz'
+    extension 'tar.gz'
+    classifier 'hermes-ios-release'
+}
+
+
+apply from: "../publish.gradle"
+
+publishing {
+    publications {
+        getByName("release") {
+            artifactId 'react-native-artifacts'
+            artifact hermesiOSDebugArtifact
+            artifact hermesiOSReleaseArtifact
+        }
+    }
+}

package/ReactAndroid/gradle.properties

@@ -1,27 +1,37 @@
-VERSION_NAME=0.69.8-2
-GROUP=com.facebook.react
+VERSION_NAME=0.71.7-0rc0
 
-POM_NAME=ReactNative
-POM_ARTIFACT_ID=react-native
-POM_PACKAGING=aar
-
-MOCKITO_CORE_VERSION=2.26.0
-POWERMOCK_VERSION=2.0.2
-ROBOLECTRIC_VERSION=4.4
-JUNIT_VERSION=4.12
+# GROUP=com.facebook.react
+# Group for the TV repo
+GROUP=io.github.react-native-tvos
 
+# JVM Versions
+ANDROIDX_APPCOMPAT_VERSION=1.4.1
+ANDROIDX_AUTOFILL_VERSION=1.1.0
 ANDROIDX_TEST_VERSION=1.1.0
-APPCOMPAT_VERSION=1.4.1
+ANDROIDX_TRACING_VERSION=1.1.0
+ASSERTJ_VERSION=3.21.0
+FBJNI_VERSION=0.3.0
 FRESCO_VERSION=2.5.0
+INFER_ANNOTATIONS_VERSION=0.18.0
+JAVAX_INJECT_VERSION=1
+JSR305_VERSION=3.0.2
+JUNIT_VERSION=4.12
+MOCKITO_CORE_VERSION=2.26.0
 OKHTTP_VERSION=4.9.2
-SO_LOADER_VERSION=0.10.3
+OKIO_VERSION=2.9.0
+POWERMOCK_VERSION=2.0.2
+PROGUARD_ANNOTATIONS_VERSION=1.19.0
+ROBOLECTRIC_VERSION=4.4
+SO_LOADER_VERSION=0.10.4
+SWIPEREFRESH_LAYOUT_VERSION=1.0.0
 
+# Native Dependency Versions
 BOOST_VERSION=1_76_0
 DOUBLE_CONVERSION_VERSION=1.1.6
-FOLLY_VERSION=2021.06.28.00
 FMT_VERSION=6.2.1
-LIBEVENT_VERSION=2.1.12
+FOLLY_VERSION=2021.07.22.00
 GLOG_VERSION=0.3.5
+LIBEVENT_VERSION=2.1.12
 
 android.useAndroidX=true
 android.enableJetifier=true

package/ReactAndroid/hermes-engine/build.gradle

@@ -11,22 +11,27 @@ plugins {
     id("de.undercouch.download")
     id("com.android.library")
     id("maven-publish")
+    id("signing")
 }
 
-group = "com.facebook.react"
+// group = "com.facebook.react"
+// Group for the TV repo
+group = "io.github.react-native-tvos"
+
 version = parent.publishing_version
+def cmakeVersion = parent.cmake_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"
+    def cmakeRelativePath = "/cmake/${cmakeVersion}/bin/cmake"
+    if (System.getenv("ANDROID_SDK_ROOT") && new File("${System.getenv("ANDROID_SDK_ROOT")}/${cmakeRelativePath}").exists()) {
+        return "${System.getenv("ANDROID_SDK_ROOT")}/${cmakeRelativePath}"
     }
-    if (System.getenv("ANDROID_HOME")) {
-        return "${System.getenv("ANDROID_HOME")}/cmake/${cmakeVersion}/bin/cmake"
+    if (System.getenv("ANDROID_HOME") && new File("${System.getenv("ANDROID_HOME")}/${cmakeRelativePath}").exists()) {
+        return "${System.getenv("ANDROID_HOME")}/${cmakeRelativePath}"
     }
     return "cmake"
 }
@@ -56,10 +61,6 @@ def skipPrefabPublishing = System.getenv("REACT_NATIVE_HERMES_SKIP_PREFAB") != n
 // 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)
@@ -86,7 +87,7 @@ task unzipHermes(dependsOn: downloadHermes, type: Copy) {
 
 task configureBuildForHermes(type: Exec) {
     workingDir(hermesDir)
-    commandLine(windowsAwareCommandLine(findCmakePath(cmakeVersion), "-S", ".", "-B", hermesBuildDir.toString(), "-DJSI_DIR=" + jsiDir.absolutePath))
+    commandLine(windowsAwareCommandLine(findCmakePath(cmakeVersion), Os.isFamily(Os.FAMILY_WINDOWS) ? "-GNMake Makefiles" : "", "-S", ".", "-B", hermesBuildDir.toString(), "-DJSI_DIR=" + jsiDir.absolutePath))
 }
 
 task buildHermes(dependsOn: configureBuildForHermes, type: Exec) {
@@ -198,8 +199,8 @@ android {
     }
 
     dependencies {
-        implementation("com.facebook.fbjni:fbjni:0.2.2")
-        implementation("com.facebook.soloader:soloader:0.10.3")
+        implementation("com.facebook.fbjni:fbjni:0.3.0")
+        implementation("com.facebook.soloader:soloader:0.10.4")
         implementation("com.facebook.yoga:proguard-annotations:1.19.0")
         implementation("androidx.annotation:annotation:1.3.0")
     }
@@ -213,7 +214,6 @@ android {
     publishing {
         multipleVariants {
             withSourcesJar()
-            withJavadocJar()
             allVariants()
         }
     }
@@ -235,27 +235,20 @@ afterEvaluate {
     }
     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)
+    prepareHeadersForPrefab.dependsOn(buildHermes)
+}
 
-    publishing {
-        publications {
-            release(MavenPublication) {
-                from components.default
-                artifactId = "hermes-engine"
-            }
-        }
-        repositories {
-            maven {
-                name = "npm"
-                url = AAR_OUTPUT_URL
-            }
+/* Publishing Configuration */
+apply from: "../publish.gradle"
+
+// We need to override the artifact ID as this project is called `hermes-engine` but
+// the maven coordinates are on `hermes-android`.
+// Please note that the original coordinates, `hermes-engine`, have been voided
+// as they caused https://github.com/facebook/react-native/issues/35210
+publishing {
+    publications {
+        getByName("release") {
+            artifactId 'hermes-android'
         }
     }
 }

package/ReactAndroid/publish.gradle

@@ -0,0 +1,100 @@
+/*
+ * 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.
+ */
+
+apply plugin: 'maven-publish'
+apply plugin: 'signing'
+
+def isNightly = findProperty("isNightly")?.toBoolean()
+def signingKey = findProperty("SIGNING_KEY")
+def signingPwd = findProperty("SIGNING_PWD")
+
+def reactAndroidProjectDir = project(':ReactAndroid').projectDir
+def androidOutputUrl = "file://${reactAndroidProjectDir}/../android"
+def mavenTempLocalUrl = "file:///tmp/maven-local"
+
+publishing {
+    publications {
+        release(MavenPublication) {
+            afterEvaluate {
+                // We do a multi variant release, so for Android libraries
+                // we publish `components.release`
+                if (plugins.hasPlugin("com.android.library")) {
+                    from components.default
+                }
+            }
+
+            // We populate the publishing version using the project version,
+            // appending -SNAPSHOT if on nightly.
+            if (isNightly) {
+                version = this.version + "-SNAPSHOT"
+            } else {
+                version = this.version
+            }
+
+            pom {
+                name = "react-native"
+                description = "A framework for building native apps with React"
+                url = "https://github.com/facebook/react-native"
+
+                developers {
+                    developer {
+                        id = "facebook"
+                        name = "Facebook"
+                    }
+                }
+
+                licenses {
+                    license {
+                        name = "MIT License"
+                        url = "https://github.com/facebook/react-native/blob/HEAD/LICENSE"
+                        distribution = "repo"
+                    }
+                }
+
+                scm {
+                    url = "https://github.com/facebook/react-native.git"
+                    connection = "scm:git:https://github.com/facebook/react-native.git"
+                    developerConnection = "scm:git:git@github.com:facebook/react-native.git"
+                }
+            }
+        }
+    }
+
+    repositories {
+        maven {
+            name = "npm"
+            url = androidOutputUrl
+        }
+        maven {
+            name = "mavenTempLocal"
+            url = mavenTempLocalUrl
+        }
+    }
+
+//     if (signingKey && signingPwd) {
+//         logger.info("PGP Key found - Signing enabled")
+//         signing {
+//             useInMemoryPgpKeys(signingKey, signingPwd)
+//             sign(publishing.publications.release)
+//         }
+//     } else {
+//         logger.info("Signing disabled as the PGP key was not found")
+//     }
+
+// For the TV repo, we sign manually for now, using the gpg command line tool.
+// Properties that need to be set:
+//
+// signing.gnupg.executable=gpg
+// signing.gnupg.useLegacyGpg=true
+// signing.gnupg.keyName=(your key ID)
+// signing.keyId=(your key ID)
+// signing.secretKeyRingFile=(file with your exported secret keys)
+    signing {
+      useGpgCmd()
+      sign(publishing.publications.release)
+    }
+}

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

@@ -4,6 +4,7 @@ rn_android_library(
     name = "yoga",
     srcs = glob(["yoga/*.java"]),
     autoglob = False,
+    language = "JAVA",
     visibility = ["PUBLIC"],
     deps = [
         react_native_dep("libraries/fbjni:java"),

package/ReactAndroid/src/main/java/com/facebook/debug/debugoverlay/model/BUCK

@@ -4,6 +4,7 @@ rn_android_library(
     name = "model",
     srcs = glob(["*.java"]),
     autoglob = False,
+    language = "JAVA",
     visibility = [
         "PUBLIC",
     ],

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

@@ -6,8 +6,8 @@ rn_android_library(
     autoglob = False,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
+    language = "JAVA",
     visibility = [
         "PUBLIC",
     ],

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

@@ -6,8 +6,8 @@ rn_android_library(
     autoglob = False,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
+    language = "JAVA",
     visibility = [
         "PUBLIC",
     ],

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

@@ -1,9 +1,10 @@
-load("//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "FBJNI_TARGET", "react_native_dep", "react_native_target", "react_native_xplat_dep", "rn_android_library", "rn_xplat_cxx_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
 
 rn_android_library(
     name = "instrumentation",
     srcs = ["HermesMemoryDumper.java"],
     autoglob = False,
+    language = "JAVA",
     visibility = [
         "PUBLIC",
     ],
@@ -15,40 +16,13 @@ rn_android_library(
     autoglob = False,
     labels = [
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
     ],
+    language = "JAVA",
     visibility = ["PUBLIC"],
     deps = [
         react_native_dep("java/com/facebook/proguard/annotations:annotations"),
         react_native_dep("libraries/soloader/java/com/facebook/soloader:soloader"),
         react_native_dep("libraries/fbjni:java"),
-        ":jni_hermes_samplingprofiler",
-    ],
-)
-
-rn_xplat_cxx_library(
-    name = "jni_hermes_samplingprofiler",
-    srcs = [
-        "HermesSamplingProfiler.cpp",
-        "OnLoad.cpp",
-    ],
-    headers = ["HermesSamplingProfiler.h"],
-    header_namespace = "",
-    compiler_flags_enable_exceptions = True,  # TODO: is this necessary?
-    compiler_flags_enable_rtti = True,  # TODO: is this necessary?
-    fbandroid_allow_jni_merging = True,
-    labels = [
-        "pfh:ReactNative_CommonInfrastructurePlaceholder",
-        "supermodule:xplat/default/public.react_native.infra",
-    ],
-    platforms = ANDROID,
-    soname = "libjsijniprofiler.$(ext)",
-    visibility = [
-        react_native_dep("java/com/facebook/jsi:jsi"),
-    ],
-    deps = [
-        react_native_target("jni/react/jni:jni"),
-        FBJNI_TARGET,
-        react_native_xplat_dep("hermes/API:HermesAPI"),
+        react_native_target("jni/react/hermes/instrumentation:jni_hermes_samplingprofiler"),
     ],
 )