From 21f814b2a681ebad408cb07a7ac7193374fd196e Mon Sep 17 00:00:00 2001 From: Sidharth Guglani Date: Tue, 17 Sep 2019 12:03:54 -0700 Subject: [PATCH] remove infer-annotations dependency (#922) Summary: Pull Request resolved: https://github.com/facebook/yoga/pull/922 We are not using this dependency anywhere in yoga. Removed in this diff. Reviewed By: passy Differential Revision: D17131081 fbshipit-source-id: 5544b892f4ef5ca0207d9e21a5b97a2940ac6d53 --- android/BUCK | 3 +-- java/BUCK | 3 +-- lib/infer-annotations/BUCK | 19 ------------------ .../infer-annotations-1.4.jar | Bin 9966 -> 0 bytes tools/build_defs/oss/yoga_defs.bzl | 2 -- 5 files changed, 2 insertions(+), 25 deletions(-) delete mode 100644 lib/infer-annotations/BUCK delete mode 100644 lib/infer-annotations/infer-annotations-1.4.jar diff --git a/android/BUCK b/android/BUCK index f72dde8b..649b96a3 100644 --- a/android/BUCK +++ b/android/BUCK @@ -3,7 +3,7 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. -load("//tools/build_defs/oss:yoga_defs.bzl", "ANDROID_JAVA_TARGET", "ANDROID_RES_TARGET", "INFER_ANNOTATIONS_TARGET", "JAVA_TARGET", "PROGRUARD_ANNOTATIONS_TARGET", "yoga_android_aar", "yoga_android_resource") +load("//tools/build_defs/oss:yoga_defs.bzl", "ANDROID_JAVA_TARGET", "ANDROID_RES_TARGET", "JAVA_TARGET", "PROGRUARD_ANNOTATIONS_TARGET", "yoga_android_aar", "yoga_android_resource") yoga_android_aar( name = "android", @@ -14,7 +14,6 @@ yoga_android_aar( deps = [ ANDROID_JAVA_TARGET, ANDROID_RES_TARGET, - INFER_ANNOTATIONS_TARGET, JAVA_TARGET, PROGRUARD_ANNOTATIONS_TARGET, ], diff --git a/java/BUCK b/java/BUCK index e25d42fd..73e0a89a 100644 --- a/java/BUCK +++ b/java/BUCK @@ -3,7 +3,7 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. -load("//tools/build_defs/oss:yoga_defs.bzl", "ANDROID", "CXX_LIBRARY_WHITELIST", "FBJNI_JAVA_TARGET", "FBJNI_TARGET", "INFER_ANNOTATIONS_TARGET", "JNI_TARGET", "JSR_305_TARGET", "JUNIT_TARGET", "PROGRUARD_ANNOTATIONS_TARGET", "SOLOADER_TARGET", "yoga_cxx_lib", "yoga_cxx_library", "yoga_dep", "yoga_java_binary", "yoga_java_library", "yoga_java_test") +load("//tools/build_defs/oss:yoga_defs.bzl", "ANDROID", "CXX_LIBRARY_WHITELIST", "FBJNI_JAVA_TARGET", "FBJNI_TARGET", "JNI_TARGET", "JSR_305_TARGET", "JUNIT_TARGET", "PROGRUARD_ANNOTATIONS_TARGET", "SOLOADER_TARGET", "yoga_cxx_lib", "yoga_cxx_library", "yoga_dep", "yoga_java_binary", "yoga_java_library", "yoga_java_test") CXX_LIBRARY_WHITELIST_FOR_TESTS = CXX_LIBRARY_WHITELIST + [ yoga_cxx_lib("testutil:jni"), @@ -51,7 +51,6 @@ yoga_java_library( deps = [ ":jni", FBJNI_JAVA_TARGET, - INFER_ANNOTATIONS_TARGET, JSR_305_TARGET, PROGRUARD_ANNOTATIONS_TARGET, SOLOADER_TARGET, diff --git a/lib/infer-annotations/BUCK b/lib/infer-annotations/BUCK deleted file mode 100644 index 2e632fcb..00000000 --- a/lib/infer-annotations/BUCK +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) Facebook, Inc. and its affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -load("//tools/build_defs/oss:yoga_defs.bzl", "YOGA_ROOTS", "yoga_java_library", "yoga_prebuilt_jar") - -yoga_prebuilt_jar( - name = "infer-annotations-jar", - binary_jar = "infer-annotations-1.4.jar", -) - -yoga_java_library( - name = "infer-annotations", - visibility = YOGA_ROOTS, - exported_deps = [ - ":infer-annotations-jar", - ], -) diff --git a/lib/infer-annotations/infer-annotations-1.4.jar b/lib/infer-annotations/infer-annotations-1.4.jar deleted file mode 100644 index 42722464856bb62964311d36fe33500155b44166..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9966 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 diff --git a/tools/build_defs/oss/yoga_defs.bzl b/tools/build_defs/oss/yoga_defs.bzl index 6232538f..ff303746 100644 --- a/tools/build_defs/oss/yoga_defs.bzl +++ b/tools/build_defs/oss/yoga_defs.bzl @@ -10,8 +10,6 @@ YOGA_ROOTS = ["//..."] JAVA_TARGET = "//java:java" -INFER_ANNOTATIONS_TARGET = "//lib/infer-annotations:infer-annotations" - JSR_305_TARGET = "//lib/jsr-305:jsr-305" JUNIT_TARGET = "//lib/junit:junit"