Skip to content

Commit c147073

Browse files
scottricefacebook-github-bot
authored andcommitted
Use fb_native_wrapper for all targets
Differential Revision: D12867696 fbshipit-source-id: bd52c1ead04065addece3a3104c4a1a9359ceb95
1 parent e90319e commit c147073

File tree

25 files changed

+144
-106
lines changed

25 files changed

+144
-106
lines changed

ReactAndroid/libs/BUCK

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
1-
android_prebuilt_aar(
1+
load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")
2+
3+
fb_native.android_prebuilt_aar(
24
name = "appcompat",
35
aar = ":appcompat-binary-aar",
46
visibility = ["//ReactAndroid/..."],
57
)
68

7-
remote_file(
9+
fb_native.remote_file(
810
name = "appcompat-binary-aar",
911
sha1 = "22b1ef4ff9ef1a3513c18eb132d597eac6ef1a86",
1012
url = "mvn:com.android.support:appcompat-v7:aar:27.1.1",
1113
)
1214

13-
android_prebuilt_aar(
15+
fb_native.android_prebuilt_aar(
1416
name = "android-jsc",
1517
aar = ":android-jsc-aar",
1618
)
1719

18-
remote_file(
20+
fb_native.remote_file(
1921
name = "android-jsc-aar",
2022
sha1 = "880cedd93f43e0fc841f01f2fa185a63d9230f85",
2123
url = "mvn:org.webkit:android-jsc:aar:r174650",

ReactAndroid/src/main/jni/prebuilt/BUCK

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")
12
load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_prebuilt_aar", "rn_prebuilt_native_library")
23
# Temp workaround to get the build working e2e, Gradle builds them for us
34

@@ -13,7 +14,7 @@ rn_android_prebuilt_aar(
1314
visibility = ["PUBLIC"],
1415
)
1516

16-
remote_file(
17+
fb_native.remote_file(
1718
name = "android-jsc-aar",
1819
sha1 = "880cedd93f43e0fc841f01f2fa185a63d9230f85",
1920
url = "mvn:org.webkit:android-jsc:aar:r174650",

ReactAndroid/src/main/jni/third-party/glibc/BUCK

+6-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44

55
# libpthread is implicitly included in the android runtime so, when building
66
# on an android platform, we don't do anything.
7-
prebuilt_cxx_library(
7+
load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")
8+
9+
fb_native.prebuilt_cxx_library(
810
name = "pthread",
911
exported_platform_linker_flags = [
1012
(
@@ -26,7 +28,7 @@ prebuilt_cxx_library(
2628
],
2729
)
2830

29-
prebuilt_cxx_library(
31+
fb_native.prebuilt_cxx_library(
3032
name = "dl",
3133
exported_linker_flags = [
3234
"-ldl",
@@ -37,7 +39,7 @@ prebuilt_cxx_library(
3739
],
3840
)
3941

40-
prebuilt_cxx_library(
42+
fb_native.prebuilt_cxx_library(
4143
name = "m",
4244
exported_linker_flags = [
4345
"-lm",
@@ -48,7 +50,7 @@ prebuilt_cxx_library(
4850
],
4951
)
5052

51-
prebuilt_cxx_library(
53+
fb_native.prebuilt_cxx_library(
5254
name = "rt",
5355
exported_platform_linker_flags = [
5456
(

ReactAndroid/src/main/libraries/fbcore/src/test/java/com/facebook/powermock/BUCK

+13-12
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")
12
load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library", "rn_prebuilt_jar")
23

34
rn_android_library(
@@ -25,7 +26,7 @@ rn_prebuilt_jar(
2526
visibility = ["//ReactAndroid/..."],
2627
)
2728

28-
remote_file(
29+
fb_native.remote_file(
2930
name = "download-powermock-core.jar",
3031
sha1 = "ea04e79244e19dcf0c3ccf6863c5b028b4b58c9c",
3132
url = "mvn:org.powermock:powermock-core:jar:1.6.2",
@@ -37,7 +38,7 @@ rn_prebuilt_jar(
3738
visibility = ["//ReactAndroid/..."],
3839
)
3940

40-
remote_file(
41+
fb_native.remote_file(
4142
name = "download-powermock-api-mockito.jar",
4243
sha1 = "c213230ae20a7b422f3d622a261d0e3427d2464c",
4344
url = "mvn:org.powermock:powermock-api-mockito:jar:1.6.2",
@@ -49,7 +50,7 @@ rn_prebuilt_jar(
4950
visibility = ["//ReactAndroid/..."],
5051
)
5152

52-
remote_file(
53+
fb_native.remote_file(
5354
name = "download-powermock-api-support.jar",
5455
sha1 = "93b21413b4ee99b7bc0dd34e1416fdca96866aaf",
5556
url = "mvn:org.powermock:powermock-api-support:jar:1.6.2",
@@ -61,7 +62,7 @@ rn_prebuilt_jar(
6162
visibility = ["//ReactAndroid/..."],
6263
)
6364

64-
remote_file(
65+
fb_native.remote_file(
6566
name = "download-powermock-module-junit4-rule.jar",
6667
sha1 = "4847638c5729b9f203e21144b0bdb5d34d888473",
6768
url = "mvn:org.powermock:powermock-module-junit4-rule:jar:1.6.2",
@@ -73,7 +74,7 @@ rn_prebuilt_jar(
7374
visibility = ["//ReactAndroid/..."],
7475
)
7576

76-
remote_file(
77+
fb_native.remote_file(
7778
name = "download-powermock-classloading-xstream.jar",
7879
sha1 = "3ced31cd7024fe365b9f3c8082d22c02434577da",
7980
url = "mvn:org.powermock:powermock-classloading-xstream:jar:1.6.2",
@@ -85,7 +86,7 @@ rn_prebuilt_jar(
8586
visibility = ["//ReactAndroid/..."],
8687
)
8788

88-
remote_file(
89+
fb_native.remote_file(
8990
name = "download-powermock-classloading-base.jar",
9091
sha1 = "c8bfc10731a02d3b241892cf2c334a754d473ca7",
9192
url = "mvn:org.powermock:powermock-classloading-base:jar:1.6.2",
@@ -97,7 +98,7 @@ rn_prebuilt_jar(
9798
visibility = ["//ReactAndroid/..."],
9899
)
99100

100-
remote_file(
101+
fb_native.remote_file(
101102
name = "download-xstream.jar",
102103
sha1 = "97e5013f391487cce4de6b0eebcde21549e91872",
103104
url = "mvn:com.thoughtworks.xstream:xstream:jar:1.4.2",
@@ -109,7 +110,7 @@ rn_prebuilt_jar(
109110
visibility = ["//ReactAndroid/..."],
110111
)
111112

112-
remote_file(
113+
fb_native.remote_file(
113114
name = "download-powermock-reflect.jar",
114115
sha1 = "1af1bbd1207c3ecdcf64973e6f9d57dcd17cc145",
115116
url = "mvn:org.powermock:powermock-reflect:jar:1.6.2",
@@ -121,7 +122,7 @@ rn_prebuilt_jar(
121122
visibility = ["//ReactAndroid/..."],
122123
)
123124

124-
remote_file(
125+
fb_native.remote_file(
125126
name = "download-javassist.jar",
126127
sha1 = "a9cbcdfb7e9f86fbc74d3afae65f2248bfbf82a0",
127128
url = "mvn:org.javassist:javassist:jar:3.20.0-GA",
@@ -133,7 +134,7 @@ rn_prebuilt_jar(
133134
visibility = ["//ReactAndroid/..."],
134135
)
135136

136-
remote_file(
137+
fb_native.remote_file(
137138
name = "download-mockito-all.jar",
138139
sha1 = "539df70269cc254a58cccc5d8e43286b4a73bf30",
139140
url = "mvn:org.mockito:mockito-all:jar:1.10.19",
@@ -145,7 +146,7 @@ rn_prebuilt_jar(
145146
visibility = ["//ReactAndroid/..."],
146147
)
147148

148-
remote_file(
149+
fb_native.remote_file(
149150
name = "download-xmlpull.jar",
150151
sha1 = "2b8e230d2ab644e4ecaa94db7cdedbc40c805dfa",
151152
url = "mvn:xmlpull:xmlpull:jar:1.1.3.1",
@@ -157,7 +158,7 @@ rn_prebuilt_jar(
157158
visibility = ["//ReactAndroid/..."],
158159
)
159160

160-
remote_file(
161+
fb_native.remote_file(
161162
name = "download-xpp3.jar",
162163
sha1 = "19d4e90b43059058f6e056f794f0ea4030d60b86",
163164
url = "mvn:xpp3:xpp3_min:jar:1.1.4c",

ReactAndroid/src/main/libraries/fresco/fresco-react-native/BUCK

+11-10
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")
12
load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library", "rn_android_prebuilt_aar", "rn_prebuilt_jar")
23

34
rn_android_prebuilt_aar(
@@ -6,19 +7,19 @@ rn_android_prebuilt_aar(
67
visibility = ["//ReactAndroid/..."],
78
)
89

9-
remote_file(
10+
fb_native.remote_file(
1011
name = "fresco-binary-aar",
1112
sha1 = "076812472879be341f392c4aab469b8fdf8c6759",
1213
url = "mvn:com.facebook.fresco:fresco:aar:1.10.0",
1314
)
1415

15-
android_prebuilt_aar(
16+
fb_native.android_prebuilt_aar(
1617
name = "fresco-drawee",
1718
aar = ":drawee-binary-aar",
1819
visibility = ["//ReactAndroid/..."],
1920
)
2021

21-
remote_file(
22+
fb_native.remote_file(
2223
name = "drawee-binary-aar",
2324
sha1 = "c1fef7cdc5f6e4fd7d7c58522075c6b66f46a52b",
2425
url = "mvn:com.facebook.fresco:drawee:aar:1.10.0",
@@ -40,7 +41,7 @@ rn_android_prebuilt_aar(
4041
visibility = ["//ReactAndroid/..."],
4142
)
4243

43-
remote_file(
44+
fb_native.remote_file(
4445
name = "imagepipeline-base-aar",
4546
sha1 = "56672fa5fa46bf4962adecc7c88a1544f5a20225",
4647
url = "mvn:com.facebook.fresco:imagepipeline-base:aar:1.10.0",
@@ -52,7 +53,7 @@ rn_android_prebuilt_aar(
5253
visibility = ["//ReactAndroid/..."],
5354
)
5455

55-
remote_file(
56+
fb_native.remote_file(
5657
name = "imagepipeline-aar",
5758
sha1 = "e317bdb7f18f0f4ac4f3ab5d3edb49fd09290a6f",
5859
url = "mvn:com.facebook.fresco:imagepipeline:aar:1.10.0",
@@ -64,31 +65,31 @@ rn_prebuilt_jar(
6465
visibility = ["//ReactAndroid/..."],
6566
)
6667

67-
remote_file(
68+
fb_native.remote_file(
6869
name = "download-bolts.jar",
6970
sha1 = "d85884acf6810a3bbbecb587f239005cbc846dc4",
7071
url = "mvn:com.parse.bolts:bolts-tasks:jar:1.4.0",
7172
)
7273

73-
android_prebuilt_aar(
74+
fb_native.android_prebuilt_aar(
7475
name = "fbcore",
7576
aar = ":fbcore-aar",
7677
visibility = ["//ReactAndroid/..."],
7778
)
7879

79-
remote_file(
80+
fb_native.remote_file(
8081
name = "fbcore-aar",
8182
sha1 = "d79dbf5e47d6e528dd1f90170e0299c14d835ab8",
8283
url = "mvn:com.facebook.fresco:fbcore:aar:1.10.0",
8384
)
8485

85-
android_prebuilt_aar(
86+
fb_native.android_prebuilt_aar(
8687
name = "imagepipeline-okhttp3",
8788
aar = ":imagepipeline-okhttp3-binary-aar",
8889
visibility = ["//ReactAndroid/..."],
8990
)
9091

91-
remote_file(
92+
fb_native.remote_file(
9293
name = "imagepipeline-okhttp3-binary-aar",
9394
sha1 = "3429ffb776d7511d0f911fbe9efda4c73179d416",
9495
url = "mvn:com.facebook.fresco:imagepipeline-okhttp3:aar:1.10.0",

ReactAndroid/src/main/libraries/soloader/java/com/facebook/soloader/BUCK

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
android_prebuilt_aar(
1+
load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")
2+
3+
fb_native.android_prebuilt_aar(
24
name = "soloader",
35
aar = ":soloader-binary-aar",
46
visibility = ["PUBLIC"],
57
)
68

7-
remote_file(
9+
fb_native.remote_file(
810
name = "soloader-binary-aar",
911
sha1 = "042357559a6c9313bdb9b1ba137a9df3b5365f35",
1012
url = "mvn:com.facebook.soloader:soloader:aar:0.5.1",

ReactAndroid/src/main/third-party/android/support-annotations/BUCK

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
prebuilt_jar(
1+
load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")
2+
3+
fb_native.prebuilt_jar(
24
name = "android-support-annotations",
35
binary_jar = ":support-annotations-binary.jar",
46
visibility = ["//ReactAndroid/..."],
57
)
68

7-
remote_file(
9+
fb_native.remote_file(
810
name = "support-annotations-binary.jar",
911
sha1 = "39ded76b5e1ce1c5b2688e1d25cdc20ecee32007",
1012
url = "mvn:com.android.support:support-annotations:jar:27.1.1",

ReactAndroid/src/main/third-party/android/support/BUCK

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")
12
load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_library", "rn_android_resource", "rn_prebuilt_jar")
23

34
rn_android_library(
@@ -17,7 +18,7 @@ rn_android_library(
1718
)
1819

1920
# a fake genrule so that BUCK files in react native are preseable in fbsource
20-
genrule(
21+
fb_native.genrule(
2122
name = "appcompat-res-cmd",
2223
out = ".",
2324
bash = "ls",

0 commit comments

Comments
 (0)