Skip to content

Commit

Permalink
Revert D34084935: Fix analysis errors with the FBCODE platform
Browse files Browse the repository at this point in the history
Differential Revision:
D34084935 (216ac27)

Original commit changeset: 8199b0b16b6b

Original Phabricator Diff: D34084935 (216ac27)

fbshipit-source-id: b5d725854c92282b2e5eddeff48d6b57b2318c1f
  • Loading branch information
aniketmathur authored and facebook-github-bot committed Feb 9, 2022
1 parent 42b3917 commit 4f42f4d
Show file tree
Hide file tree
Showing 6 changed files with 2 additions and 48 deletions.
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
load(
"@fbsource//tools/build_defs:default_platform_defs.bzl",
"ANDROID",
"get_default_target_platform",
)
load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")

fb_native.android_library(
Expand All @@ -13,19 +8,16 @@ fb_native.android_library(
":soloader-binary",
],
visibility = ["PUBLIC"],
default_target_platform = get_default_target_platform(ANDROID),
)

fb_native.prebuilt_jar(
name = "annotation-binary",
binary_jar = ":annotation-binary.jar",
default_target_platform = get_default_target_platform(ANDROID),
)

fb_native.prebuilt_jar(
name = "nativeloader-binary",
binary_jar = ":nativeloader-binary.jar",
default_target_platform = get_default_target_platform(ANDROID),
)

fb_native.android_prebuilt_aar(
Expand All @@ -37,19 +29,16 @@ fb_native.remote_file(
name = "annotation-binary.jar",
sha1 = "dc58463712cb3e5f03d8ee5ac9743b9ced9afa77",
url = "mvn:com.facebook.soloader:annotation:jar:0.10.3",
default_target_platform = get_default_target_platform(ANDROID),
)

fb_native.remote_file(
name = "nativeloader-binary.jar",
sha1 = "171783d0f3f525fb9e18eb3af758c0b3aaeaed69",
url = "mvn:com.facebook.soloader:nativeloader:jar:0.10.3",
default_target_platform = get_default_target_platform(ANDROID),
)

fb_native.remote_file(
name = "soloader-binary-aar",
sha1 = "7f5d7fb7dd272fd016e32c278e6950258ebb8e22",
url = "mvn:com.facebook.soloader:soloader:aar:0.10.3",
default_target_platform = get_default_target_platform(ANDROID),
)
11 changes: 1 addition & 10 deletions ReactAndroid/src/main/third-party/android/androidx/BUCK
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
load(
"@fbsource//tools/build_defs:default_platform_defs.bzl",
"ANDROID",
"get_default_target_platform",
)
load("@fbsource//tools/build_defs:fb_native_wrapper.bzl", "fb_native")
load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")

fb_native.prebuilt_jar(
name = "annotation",
binary_jar = ":annotation.jar",
visibility = ["PUBLIC"],
default_target_platform = get_default_target_platform(ANDROID),
)

fb_native.android_library(
Expand Down Expand Up @@ -384,7 +378,6 @@ fb_native.android_prebuilt_aar(
fb_native.prebuilt_jar(
name = "collection-binary",
binary_jar = ":collection-binary.jar",
default_target_platform = get_default_target_platform(ANDROID),
)

fb_native.android_prebuilt_aar(
Expand All @@ -400,7 +393,6 @@ fb_native.android_prebuilt_aar(
fb_native.prebuilt_jar(
name = "core-common-binary",
binary_jar = ":core-common-binary.jar",
default_target_platform = get_default_target_platform(ANDROID),
)

fb_native.android_prebuilt_aar(
Expand Down Expand Up @@ -451,7 +443,6 @@ fb_native.android_prebuilt_aar(
fb_native.prebuilt_jar(
name = "lifecycle-common-binary",
binary_jar = ":lifecycle-common-binary.jar",
default_target_platform = get_default_target_platform(ANDROID),
)

fb_native.android_prebuilt_aar(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
load(
"@fbsource//tools/build_defs:default_platform_defs.bzl",
"ANDROID",
"get_default_target_platform",
)
load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")
load("//tools/build_defs/oss:rn_defs.bzl", "react_native_integration_tests_target")

Expand All @@ -13,5 +8,4 @@ fb_native.prebuilt_jar(
visibility = [
react_native_integration_tests_target("..."),
],
default_target_platform = get_default_target_platform(ANDROID),
)
6 changes: 0 additions & 6 deletions ReactAndroid/src/main/third-party/java/jsr-305/BUCK
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
load(
"@fbsource//tools/build_defs:default_platform_defs.bzl",
"ANDROID",
"get_default_target_platform",
)
load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")

fb_native.prebuilt_jar(
name = "jsr-305",
binary_jar = ":jsr305-binary.jar",
visibility = ["PUBLIC"],
default_target_platform = get_default_target_platform(ANDROID),
)

fb_native.remote_file(
Expand Down
6 changes: 0 additions & 6 deletions ReactAndroid/src/main/third-party/java/jsr-330/BUCK
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
load(
"@fbsource//tools/build_defs:default_platform_defs.bzl",
"ANDROID",
"get_default_target_platform",
)
load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")

fb_native.prebuilt_jar(
name = "jsr-330",
binary_jar = ":jsr330-binary.jar",
visibility = ["PUBLIC"],
default_target_platform = get_default_target_platform(ANDROID),
)

fb_native.remote_file(
Expand Down
10 changes: 1 addition & 9 deletions ReactAndroid/src/test/resources/BUCK
Original file line number Diff line number Diff line change
@@ -1,16 +1,9 @@
load(
"@fbsource//tools/build_defs:default_platform_defs.bzl",
"ANDROID",
"get_default_target_platform",
)

# Copyright (c) Meta Platforms, Inc. and affiliates.
#
# This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree.
load("@fbsource//tools/build_defs:fb_native_wrapper.bzl", "fb_native")

fb_native.java_library(
java_library(
name = "robolectric",
srcs = [],
labels = [
Expand All @@ -21,5 +14,4 @@ fb_native.java_library(
],
resources_root = ".",
visibility = ["PUBLIC"],
default_target_platform = get_default_target_platform(ANDROID),
)

0 comments on commit 4f42f4d

Please sign in to comment.