Skip to content

Commit cb87c3f

Browse files
empyricalfacebook-github-bot
authored andcommitted
Fix failing Android CI (#21083)
Summary: This PR does 2 things: * Have Facebook internal dependencies only be added if `IS_OSS_BUILD` is `True`. This syntax is used in other BUCK files in the codebase. * `ReactAndroid/src/androidTest/java/com/facebook/react/tests/core/BUCK` * `ReactAndroid/src/androidTest/java/com/facebook/react/testing/rule/BUCK` * Add a missing Android dependency to this BUCK file: * `ReactAndroid/src/main/java/com/facebook/react/BUCK` As a result, `test_android` is passing again. Pull Request resolved: #21083 Differential Revision: D9809808 Pulled By: hramos fbshipit-source-id: c840ea2892006a88fe13de1b1324746d030ebaf2
1 parent 4b106be commit cb87c3f

File tree

3 files changed

+12
-7
lines changed
  • ReactAndroid/src
    • androidTest/java/com/facebook/react
    • main/java/com/facebook/react

3 files changed

+12
-7
lines changed

Diff for: ReactAndroid/src/androidTest/java/com/facebook/react/testing/rule/BUCK

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# BUILD FILE SYNTAX: SKYLARK
22
load(
33
"//tools/build_defs/oss:rn_defs.bzl",
4+
"IS_OSS_BUILD",
45
"react_native_dep",
56
"react_native_integration_tests_target",
67
"react_native_target",
@@ -13,9 +14,7 @@ rn_android_library(
1314
visibility = [
1415
"PUBLIC",
1516
],
16-
deps = [
17-
react_native_dep("java/com/facebook/testing/instrumentation:instrumentation"),
18-
react_native_dep("java/com/facebook/testing/instrumentation/base:base"),
17+
deps = ([
1918
react_native_dep("third-party/java/espresso:espresso"),
2019
react_native_dep("third-party/java/jsr-305:jsr-305"),
2120
react_native_dep("third-party/java/junit:junit"),
@@ -31,5 +30,8 @@ rn_android_library(
3130
react_native_target("java/com/facebook/react/modules/core:core"),
3231
react_native_target("java/com/facebook/react/shell:shell"),
3332
react_native_target("java/com/facebook/react/uimanager:uimanager"),
34-
],
33+
]) + ([
34+
react_native_dep("java/com/facebook/testing/instrumentation:instrumentation"),
35+
react_native_dep("java/com/facebook/testing/instrumentation/base:base"),
36+
]) if not IS_OSS_BUILD else [],
3537
)

Diff for: ReactAndroid/src/androidTest/java/com/facebook/react/tests/core/BUCK

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# BUILD FILE SYNTAX: SKYLARK
22
load(
33
"//tools/build_defs/oss:rn_defs.bzl",
4+
"IS_OSS_BUILD",
45
"react_native_dep",
56
"react_native_integration_tests_target",
67
"react_native_target",
@@ -10,8 +11,7 @@ load(
1011
rn_android_library(
1112
name = "core",
1213
srcs = glob(["*.java"]),
13-
deps = [
14-
react_native_dep("java/com/facebook/fbreact/testing:testing"),
14+
deps = ([
1515
react_native_dep("third-party/java/espresso:espresso"),
1616
react_native_dep("third-party/java/fest:fest"),
1717
react_native_dep("third-party/java/junit:junit"),
@@ -22,5 +22,7 @@ rn_android_library(
2222
react_native_target("java/com/facebook/react/bridge:bridge"),
2323
react_native_target("java/com/facebook/react/shell:shell"),
2424
react_native_target("java/com/facebook/react/uimanager:uimanager"),
25-
],
25+
]) + ([
26+
react_native_dep("java/com/facebook/fbreact/testing:testing"),
27+
]) if not IS_OSS_BUILD else [],
2628
)

Diff for: ReactAndroid/src/main/java/com/facebook/react/BUCK

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ rn_android_library(
55
srcs = glob(["*.java"]),
66
provided_deps = [
77
react_native_dep("third-party/android/support/v4:lib-support-v4"),
8+
react_native_dep("third-party/android/support-annotations:android-support-annotations"),
89
],
910
visibility = [
1011
"PUBLIC",

0 commit comments

Comments
 (0)