Revert D34084935: Fix analysis errors with the FBCODE platform

Differential Revision: D34084935 (216ac27) Original commit changeset: 8199b0b16b6b Original Phabricator Diff: D34084935 (216ac27) fbshipit-source-id: b5d725854c92282b2e5eddeff48d6b57b2318c1f
facebook · Feb 9, 2022 · 4f42f4d · 4f42f4d
1 parent 42b3917
commit 4f42f4d
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 48 deletions.
diff --git a/ReactAndroid/src/main/libraries/soloader/java/com/facebook/soloader/BUCK b/ReactAndroid/src/main/libraries/soloader/java/com/facebook/soloader/BUCK
@@ -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(
@@ -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(
@@ -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),
 )
diff --git a/ReactAndroid/src/main/third-party/android/androidx/BUCK b/ReactAndroid/src/main/third-party/android/androidx/BUCK
@@ -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(
@@ -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(
@@ -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(
@@ -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(

diff --git a/ReactAndroid/src/main/third-party/java/buck-android-support/BUCK b/ReactAndroid/src/main/third-party/java/buck-android-support/BUCK
@@ -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")
 
@@ -13,5 +8,4 @@ fb_native.prebuilt_jar(
     visibility = [
         react_native_integration_tests_target("..."),
     ],
-    default_target_platform = get_default_target_platform(ANDROID),
 )
diff --git a/ReactAndroid/src/main/third-party/java/jsr-305/BUCK b/ReactAndroid/src/main/third-party/java/jsr-305/BUCK
@@ -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(

diff --git a/ReactAndroid/src/main/third-party/java/jsr-330/BUCK b/ReactAndroid/src/main/third-party/java/jsr-330/BUCK
@@ -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(

diff --git a/ReactAndroid/src/test/resources/BUCK b/ReactAndroid/src/test/resources/BUCK
@@ -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 = [
@@ -21,5 +14,4 @@ fb_native.java_library(
     ],
     resources_root = ".",
     visibility = ["PUBLIC"],
-    default_target_platform = get_default_target_platform(ANDROID),
 )