From 1bff38a5f122ac237ae162a494270b8a372de3f7 Mon Sep 17 00:00:00 2001 From: Janic Duplessis Date: Tue, 10 Sep 2019 03:58:32 -0700 Subject: [PATCH] Fix rntester buck build (#26221) Summary: CI buck build is currently broken, this fixes it. ## Changelog [Internal] [Fixed] - Fix rntester buck build Pull Request resolved: https://github.com/facebook/react-native/pull/26221 Test Plan: `buck fetch rntester && buck build rntester` Reviewed By: cpojer Differential Revision: D17091483 Pulled By: osdnk fbshipit-source-id: 09fd86270e7b27d2632b936cc809d80299c7ab38 --- RNTester/android/app/BUCK | 2 ++ .../com/facebook/proguard/annotations/BUCK | 18 ++++++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/RNTester/android/app/BUCK b/RNTester/android/app/BUCK index ceb05c3e109..36279061dd8 100644 --- a/RNTester/android/app/BUCK +++ b/RNTester/android/app/BUCK @@ -15,6 +15,7 @@ rn_android_library( is_androidx = True, deps = [ ":res", + react_native_dep("libraries/soloader/java/com/facebook/soloader:soloader"), react_native_dep("third-party/android/androidx:annotation"), react_native_dep("third-party/android/androidx:appcompat"), react_native_dep("third-party/android/androidx:core"), @@ -25,6 +26,7 @@ rn_android_library( react_native_target("java/com/facebook/react:react"), react_native_target("java/com/facebook/react/common:build_config"), react_native_target("java/com/facebook/react/modules/core:core"), + react_native_target("java/com/facebook/react/views/text:text"), react_native_target("java/com/facebook/react/shell:shell"), react_native_target("jni/prebuilt:android-jsc"), # .so files are prebuilt by Gradle with `./gradlew :ReactAndroid:packageReactNdkLibsForBuck` diff --git a/ReactAndroid/src/main/java/com/facebook/proguard/annotations/BUCK b/ReactAndroid/src/main/java/com/facebook/proguard/annotations/BUCK index d67d02d3b95..31dc81e2400 100644 --- a/ReactAndroid/src/main/java/com/facebook/proguard/annotations/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/proguard/annotations/BUCK @@ -1,4 +1,17 @@ -load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library") +load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") +load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library", "rn_prebuilt_jar") + +rn_prebuilt_jar( + name = "yoga-annotations", + binary_jar = ":annotations-binary.jar", + visibility = ["PUBLIC"], +) + +fb_native.remote_file( + name = "annotations-binary.jar", + sha1 = "3d015bb821875657ac8e4b808a223aae339defb2", + url = "https://jcenter.bintray.com/com/facebook/yoga/proguard-annotations/1.14.1/proguard-annotations-1.14.1.jar", +) rn_android_library( name = "annotations", @@ -7,6 +20,7 @@ rn_android_library( visibility = [ "PUBLIC", ], - deps = [ + exported_deps = [ + ":yoga-annotations", ], )