Skip to content

Commit

Permalink
CI for Android fixed
Browse files Browse the repository at this point in the history
Summary:
Fix for android github CI.

Github CI doesn't work without this change.

CI passes.

[INTERNAL] Android CI fix.
Closes #17551

Differential Revision: D6707477

Pulled By: hramos

fbshipit-source-id: f98515234da3b90ee3233523bcd7cc67ed82c1b4
  • Loading branch information
dryganets authored and facebook-github-bot committed Jan 12, 2018
1 parent e16d673 commit c8e98bb
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ prebuilt_jar(
export_file(
name = "robolectric-android-all-binary-jar",
src = ":robolectric-android-all-binary-remote-jar",
out = "android-all-4.1.2_r1-robolectric-0.jar", # name defines filename used by robolectric in runtime
out = "../android-all-4.1.2_r1-robolectric-0.jar", # name defines filename used by robolectric in runtime
)

remote_file(
Expand All @@ -133,7 +133,7 @@ prebuilt_jar(
export_file(
name = "json-jar",
src = ":json-remote-jar",
out = "json-20080701.jar", # name defines filename used by robolectric in runtime
out = "../json-20080701.jar", # name defines filename used by robolectric in runtime
)

remote_file(
Expand All @@ -151,7 +151,7 @@ prebuilt_jar(
export_file(
name = "tagsoup-jar",
src = ":tagsoup-remote-jar",
out = "tagsoup-1.2.jar", # name defines filename used by robolectric in runtime
out = "../tagsoup-1.2.jar", # name defines filename used by robolectric in runtime
)

remote_file(
Expand All @@ -169,7 +169,7 @@ prebuilt_jar(
export_file(
name = "robolectric-shadows-binary-jar",
src = ":robolectric-shadows-binary-remote-jar",
out = "shadows-core-3.0-16.jar", # name defines filename used by robolectric in runtime
out = "../shadows-core-3.0-16.jar", # name defines filename used by robolectric in runtime
)

remote_file(
Expand Down
3 changes: 1 addition & 2 deletions ReactCommon/DEFS
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

# Building is not supported in OSS right now
def rn_xplat_cxx_library(name, **kwargs):
cxx_library(name = name)

cxx_library(name, **kwargs)
# Helper for referring to an Android RN target
def react_native_target(path):
return '//ReactAndroid/src/main/' + path
Expand Down
4 changes: 3 additions & 1 deletion ReactCommon/yoga/BUCK
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
fb_xplat_cxx_library(
include_defs("//ReactCommon/DEFS")

rn_xplat_cxx_library(
name = "yoga",
srcs = glob(["yoga/*.cpp"]),
header_namespace = "",
Expand Down

0 comments on commit c8e98bb

Please sign in to comment.