From acd4a3b1d4e1e07eb54c8f7565e55f4cb496aaa7 Mon Sep 17 00:00:00 2001
From: Dulmandakh <dulmandakh@gmail.com>
Date: Thu, 17 Oct 2019 01:04:35 -0700
Subject: [PATCH] fix Android CI (#26862)

Summary:
This PR fixes Android CI.

## Changelog

[Android] [Fixed] - fix Android CI
Pull Request resolved: https://github.com/facebook/react-native/pull/26862

Test Plan: Android CI is green again

Differential Revision: D17925576

Pulled By: mdvacca

fbshipit-source-id: 90bdccda96a11210254a9eaab3c373151057f332
---
 .../com/facebook/hermes/reactexecutor/BUCK    |  1 +
 .../soloader/java/com/facebook/soloader/BUCK  | 35 +++++++++++++++++--
 .../third-party/java/testing-support-lib/BUCK | 30 ++++++++++++----
 3 files changed, 58 insertions(+), 8 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/BUCK b/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/BUCK
index f3ae7739074..5f42f833dfb 100644
--- a/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/BUCK
@@ -13,6 +13,7 @@ rn_android_library(
         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/hermes/instrumentation:hermes_samplingprofiler"),
         react_native_target("java/com/facebook/react/bridge:bridge"),
         ":jni",
         ":runtimeconfig",
diff --git a/ReactAndroid/src/main/libraries/soloader/java/com/facebook/soloader/BUCK b/ReactAndroid/src/main/libraries/soloader/java/com/facebook/soloader/BUCK
index a35d8da7a6b..8db09e684ee 100644
--- a/ReactAndroid/src/main/libraries/soloader/java/com/facebook/soloader/BUCK
+++ b/ReactAndroid/src/main/libraries/soloader/java/com/facebook/soloader/BUCK
@@ -1,11 +1,42 @@
 load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")
 
-fb_native.android_prebuilt_aar(
+fb_native.android_library(
     name = "soloader",
-    aar = ":soloader-binary-aar",
+    exported_deps = [
+        ":annotation-binary",
+        ":nativeloader-binary",
+        ":soloader-binary",
+    ],
     visibility = ["PUBLIC"],
 )
 
+fb_native.android_prebuilt_aar(
+    name = "annotation-binary",
+    aar = ":annotation-binary-aar",
+)
+
+fb_native.prebuilt_jar(
+    name = "nativeloader-binary",
+    binary_jar = ":nativeloader-binary.jar",
+)
+
+fb_native.android_prebuilt_aar(
+    name = "soloader-binary",
+    aar = ":soloader-binary-aar",
+)
+
+fb_native.remote_file(
+    name = "annotation-binary-aar",
+    sha1 = "ae6d46195467467fae746c6225f79ac41e7039e8",
+    url = "mvn:com.facebook.soloader:annotation:aar:0.8.0",
+)
+
+fb_native.remote_file(
+    name = "nativeloader-binary.jar",
+    sha1 = "50524ca901bccb0540204b8166abb23557809050",
+    url = "mvn:com.facebook.soloader:nativeloader:jar:0.8.0",
+)
+
 fb_native.remote_file(
     name = "soloader-binary-aar",
     sha1 = "71378622ece36680b9bab7863c3d0259b442305e",
diff --git a/ReactAndroid/src/main/third-party/java/testing-support-lib/BUCK b/ReactAndroid/src/main/third-party/java/testing-support-lib/BUCK
index b611db811de..43692052e1f 100644
--- a/ReactAndroid/src/main/third-party/java/testing-support-lib/BUCK
+++ b/ReactAndroid/src/main/third-party/java/testing-support-lib/BUCK
@@ -1,19 +1,37 @@
 load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")
-load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_prebuilt_aar")
 
-rn_android_prebuilt_aar(
+fb_native.android_library(
     name = "runner",
-    aar = ":testing-support-lib-runner-download",
-    visibility = ["//ReactAndroid/..."],
+    exported_deps = [
+        ":monitor-binary",
+        ":runner-binary",
+    ],
+    visibility = ["PUBLIC"],
+)
+
+fb_native.android_prebuilt_aar(
+    name = "monitor-binary",
+    aar = ":monitor-binary-aar",
+)
+
+fb_native.android_prebuilt_aar(
+    name = "runner-binary",
+    aar = ":runner-binary-aar",
 )
 
 fb_native.remote_file(
-    name = "testing-support-lib-runner-download",
+    name = "monitor-binary-aar",
+    sha1 = "443c2f33d4e19f868cd4e4437909ec8dcf43f053",
+    url = "mvn:androidx.test:monitor:aar:1.1.1",
+)
+
+fb_native.remote_file(
+    name = "runner-binary-aar",
     sha1 = "810a7aacb5106d92cdf648b2497694c4ebf73500",
     url = "mvn:androidx.test:runner:aar:1.1.1",
 )
 
-rn_android_prebuilt_aar(
+fb_native.android_prebuilt_aar(
     name = "exposed-instrumentation-api",
     aar = ":testing-support-instrumentation",
     visibility = ["//ReactAndroid/..."],