From 111cb3238216b40d934d3f9031114e76c436e2e8 Mon Sep 17 00:00:00 2001
From: Marc Horowitz <mhorowitz@fb.com>
Date: Thu, 15 Aug 2019 14:45:37 -0700
Subject: [PATCH] Fix BUCK-related React Native CI failures

Reviewed By: cpojer

Differential Revision: D16812633

fbshipit-source-id: 50de7603fbb514ff1c3bb6c5fa6afd579d8a20b8
---
 ReactAndroid/src/main/java/com/facebook/BUCK  |  1 +
 .../com/facebook/hermes/instrumentation/BUCK  |  7 ++-
 .../com/facebook/hermes/reactexecutor/BUCK    | 54 +++++++++++++++++++
 3 files changed, 58 insertions(+), 4 deletions(-)
 create mode 100644 ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/BUCK

diff --git a/ReactAndroid/src/main/java/com/facebook/BUCK b/ReactAndroid/src/main/java/com/facebook/BUCK
index 46f5b18b63c..375cfdd543f 100644
--- a/ReactAndroid/src/main/java/com/facebook/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/BUCK
@@ -5,6 +5,7 @@ rn_android_library(
     srcs = glob(["yoga/*.java"]),
     visibility = ["PUBLIC"],
     deps = [
+        react_native_dep("java/com/facebook/jni:jni"),
         react_native_dep("java/com/facebook/proguard/annotations:annotations"),
         react_native_dep("libraries/soloader/java/com/facebook/soloader:soloader"),
         react_native_dep("third-party/java/infer-annotations:infer-annotations"),
diff --git a/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/BUCK b/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/BUCK
index 4de1b113797..414bae4a3b3 100644
--- a/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/BUCK
@@ -1,4 +1,4 @@
-load("@fbsource//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "FBJNI_TARGET", "react_native_dep", "react_native_target", "rn_android_library", "rn_xplat_cxx_library")
+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")
 
 rn_android_library(
     name = "instrumentation",
@@ -28,16 +28,15 @@ rn_xplat_cxx_library(
     ],
     headers = ["HermesSamplingProfiler.h"],
     header_namespace = "",
-    #allow_jni_merging = True,
     compiler_flags = ["-fexceptions"],
     platforms = ANDROID,
     soname = "libjsijniprofiler.$(ext)",
     visibility = [
-        "fbandroid//java/com/facebook/jsi:jsi",
+        react_native_dep("java/com/facebook/jsi:jsi"),
     ],
     deps = [
         react_native_target("jni/react/jni:jni"),
         FBJNI_TARGET,
-        "fbsource//xplat/hermes/API:HermesAPI",
+        react_native_xplat_dep("hermes/API:HermesAPI"),
     ],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/BUCK b/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/BUCK
new file mode 100644
index 00000000000..f3ae7739074
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/BUCK
@@ -0,0 +1,54 @@
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library", "rn_xplat_cxx_library")
+
+rn_android_library(
+    name = "reactexecutor",
+    srcs = [
+        "HermesExecutor.java",
+        "HermesExecutorFactory.java",
+    ],
+    visibility = [
+        "PUBLIC",
+    ],
+    deps = [
+        react_native_dep("libraries/soloader/java/com/facebook/soloader:soloader"),
+        react_native_dep("third-party/java/jsr-305:jsr-305"),
+        react_native_target("java/com/facebook/hermes/instrumentation:instrumentation"),
+        react_native_target("java/com/facebook/react/bridge:bridge"),
+        ":jni",
+        ":runtimeconfig",
+    ],
+)
+
+rn_android_library(
+    name = "runtimeconfig",
+    srcs = [
+        "RuntimeConfig.java",
+    ],
+    visibility = [
+        "PUBLIC",
+    ],
+    deps = [
+        react_native_dep("third-party/java/jsr-305:jsr-305"),
+        react_native_target("java/com/facebook/hermes/instrumentation:instrumentation"),
+    ],
+)
+
+rn_xplat_cxx_library(
+    name = "jni-interface",
+    srcs = [],
+    header_namespace = "hermes/reactexecutor",
+    exported_headers = glob(["*.h"]),
+    visibility = ["PUBLIC"],
+)
+
+rn_xplat_cxx_library(
+    name = "jni",
+    srcs = ["OnLoad.cpp"],
+    headers = [],
+    header_namespace = "",
+    compiler_flags = ["-fexceptions"],
+    soname = "libhermes-executor.$(ext)",
+    visibility = [
+        react_native_target("java/com/facebook/hermes/reactexecutor:reactexecutor"),
+    ],
+)