Move 'com.facebook.testing.instrumentation' dependency to rn_defs.bzl

facebook · Sep 13, 2018 · 0d5efa9 · 0d5efa9
1 parent ab97b9f
commit 0d5efa9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/rule/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/rule/BUCK
@@ -1,6 +1,8 @@
 # BUILD FILE SYNTAX: SKYLARK
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
+    "INSTRUMENTATION_TARGETS",
+    "IS_OSS_BUILD",
     "react_native_dep",
     "react_native_integration_tests_target",
     "react_native_target",
@@ -13,9 +15,7 @@ rn_android_library(
     visibility = [
         "PUBLIC",
     ],
-    deps = [
-        react_native_dep("java/com/facebook/testing/instrumentation:instrumentation"),
-        react_native_dep("java/com/facebook/testing/instrumentation/base:base"),
+    deps = ([
         react_native_dep("third-party/java/espresso:espresso"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),
         react_native_dep("third-party/java/junit:junit"),
@@ -31,5 +31,5 @@ rn_android_library(
         react_native_target("java/com/facebook/react/modules/core:core"),
         react_native_target("java/com/facebook/react/shell:shell"),
         react_native_target("java/com/facebook/react/uimanager:uimanager"),
-    ],
+    ]) + INSTRUMENTATION_TARGETS if not IS_OSS_BUILD else [],
 )
diff --git a/tools/build_defs/oss/rn_defs.bzl b/tools/build_defs/oss/rn_defs.bzl
@@ -47,6 +47,11 @@ JNI_TARGET = "//ReactAndroid/src/main/jni/first-party/jni-hack:jni-hack"
 
 KEYSTORE_TARGET = "//keystores:debug"
 
+INSTRUMENTATION_TARGETS = [
+    "//ReactAndroid/src/main/java/com/facebook/testing/instrumentation:instrumentation",
+    "//ReactAndroid/src/main/java/com/facebook/testing/instrumentation/base:base",
+]
+
 def get_apple_inspector_flags():
     return []