From 9b13fdeae4e604b15faa8d45d9f1cd282303d8cf Mon Sep 17 00:00:00 2001 From: Pascal Hartig Date: Thu, 16 Mar 2017 10:40:58 -0700 Subject: [PATCH] Add YOGA_ROOTS to permit multiple definitions Summary: This changes the `YOGA_ROOT` to `YOGA_ROOTS` in `YOGA_DEFS`. This allows the inclusion of Yoga in the exported Components libraries directory and back-references to the nested dependencies within it. Reviewed By: rspencer01 Differential Revision: D4721745 fbshipit-source-id: 2dc9d4a730076510aed02027cb6713f6326c588d --- YOGA_DEFS | 2 +- .../src/main/java/com/facebook/proguard/annotations/BUCK | 2 +- lib/android-support/BUCK | 2 +- lib/appcompat/BUCK | 2 +- lib/fb/BUCK | 2 +- lib/gtest/BUCK | 2 +- lib/infer-annotations/BUCK | 2 +- lib/jsr-305/BUCK | 2 +- lib/junit/BUCK | 2 +- lib/soloader/BUCK | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/YOGA_DEFS b/YOGA_DEFS index ec3ed484..12380caa 100644 --- a/YOGA_DEFS +++ b/YOGA_DEFS @@ -1,5 +1,5 @@ -YOGA_ROOT = '//...' +YOGA_ROOTS = ['//...'] JAVA_TARGET = '//java:java' INFER_ANNOTATIONS_TARGET = '//lib/infer-annotations:infer-annotations' JSR_305_TARGET = '//lib/jsr-305:jsr-305' diff --git a/java/proguard-annotations/src/main/java/com/facebook/proguard/annotations/BUCK b/java/proguard-annotations/src/main/java/com/facebook/proguard/annotations/BUCK index 05f47635..ce3df131 100644 --- a/java/proguard-annotations/src/main/java/com/facebook/proguard/annotations/BUCK +++ b/java/proguard-annotations/src/main/java/com/facebook/proguard/annotations/BUCK @@ -12,6 +12,6 @@ java_library( srcs = glob(["*.java"]), source = "1.7", target = "1.7", - visibility = [YOGA_ROOT], + visibility = YOGA_ROOTS, deps = [], ) diff --git a/lib/android-support/BUCK b/lib/android-support/BUCK index 3dc16289..a58cdb00 100644 --- a/lib/android-support/BUCK +++ b/lib/android-support/BUCK @@ -10,5 +10,5 @@ include_defs("//YOGA_DEFS") prebuilt_jar( name = "android-support", binary_jar = "android-support-v4.jar", - visibility = [YOGA_ROOT], + visibility = YOGA_ROOTS, ) diff --git a/lib/appcompat/BUCK b/lib/appcompat/BUCK index f0bfdb99..e6efbd4d 100644 --- a/lib/appcompat/BUCK +++ b/lib/appcompat/BUCK @@ -10,5 +10,5 @@ include_defs("//YOGA_DEFS") android_prebuilt_aar( name = "appcompat", aar = "appcompat-v7-19.1.0.aar", - visibility = [YOGA_ROOT], + visibility = YOGA_ROOTS, ) diff --git a/lib/fb/BUCK b/lib/fb/BUCK index 03828420..bebb85b9 100644 --- a/lib/fb/BUCK +++ b/lib/fb/BUCK @@ -16,7 +16,7 @@ prebuilt_cxx_library( ), ], header_only = True, - visibility = [YOGA_ROOT], + visibility = YOGA_ROOTS, ) cxx_library( diff --git a/lib/gtest/BUCK b/lib/gtest/BUCK index 5955abce..c09f2da9 100644 --- a/lib/gtest/BUCK +++ b/lib/gtest/BUCK @@ -22,6 +22,6 @@ cxx_library( ("googletest/googletest", "src/*.cc"), ]), header_namespace = "", - visibility = [YOGA_ROOT], + visibility = YOGA_ROOTS, deps = [], ) diff --git a/lib/infer-annotations/BUCK b/lib/infer-annotations/BUCK index 67835b3a..9856143b 100644 --- a/lib/infer-annotations/BUCK +++ b/lib/infer-annotations/BUCK @@ -17,5 +17,5 @@ java_library( exported_deps = [ ":infer-annotations-jar", ], - visibility = [YOGA_ROOT], + visibility = YOGA_ROOTS, ) diff --git a/lib/jsr-305/BUCK b/lib/jsr-305/BUCK index 54453b9e..329e4587 100644 --- a/lib/jsr-305/BUCK +++ b/lib/jsr-305/BUCK @@ -17,5 +17,5 @@ java_library( exported_deps = [ ":jsr305-jar", ], - visibility = [YOGA_ROOT], + visibility = YOGA_ROOTS, ) diff --git a/lib/junit/BUCK b/lib/junit/BUCK index 183eece4..d29717af 100644 --- a/lib/junit/BUCK +++ b/lib/junit/BUCK @@ -17,5 +17,5 @@ java_library( exported_deps = [ ":junit-jar", ], - visibility = [YOGA_ROOT], + visibility = YOGA_ROOTS, ) diff --git a/lib/soloader/BUCK b/lib/soloader/BUCK index fa3d92e6..40e15c83 100644 --- a/lib/soloader/BUCK +++ b/lib/soloader/BUCK @@ -10,5 +10,5 @@ include_defs("//YOGA_DEFS") android_prebuilt_aar( name = "soloader", aar = "soloader-0.1.0.aar", - visibility = [YOGA_ROOT], + visibility = YOGA_ROOTS, )