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
This commit is contained in:
Pascal Hartig
2017-03-16 10:40:58 -07:00
committed by Facebook Github Bot
parent 794b6b35ce
commit 9b13fdeae4
10 changed files with 10 additions and 10 deletions

View File

@@ -1,5 +1,5 @@
YOGA_ROOT = '//...' YOGA_ROOTS = ['//...']
JAVA_TARGET = '//java:java' JAVA_TARGET = '//java:java'
INFER_ANNOTATIONS_TARGET = '//lib/infer-annotations:infer-annotations' INFER_ANNOTATIONS_TARGET = '//lib/infer-annotations:infer-annotations'
JSR_305_TARGET = '//lib/jsr-305:jsr-305' JSR_305_TARGET = '//lib/jsr-305:jsr-305'

View File

@@ -12,6 +12,6 @@ java_library(
srcs = glob(["*.java"]), srcs = glob(["*.java"]),
source = "1.7", source = "1.7",
target = "1.7", target = "1.7",
visibility = [YOGA_ROOT], visibility = YOGA_ROOTS,
deps = [], deps = [],
) )

View File

@@ -10,5 +10,5 @@ include_defs("//YOGA_DEFS")
prebuilt_jar( prebuilt_jar(
name = "android-support", name = "android-support",
binary_jar = "android-support-v4.jar", binary_jar = "android-support-v4.jar",
visibility = [YOGA_ROOT], visibility = YOGA_ROOTS,
) )

View File

@@ -10,5 +10,5 @@ include_defs("//YOGA_DEFS")
android_prebuilt_aar( android_prebuilt_aar(
name = "appcompat", name = "appcompat",
aar = "appcompat-v7-19.1.0.aar", aar = "appcompat-v7-19.1.0.aar",
visibility = [YOGA_ROOT], visibility = YOGA_ROOTS,
) )

View File

@@ -16,7 +16,7 @@ prebuilt_cxx_library(
), ),
], ],
header_only = True, header_only = True,
visibility = [YOGA_ROOT], visibility = YOGA_ROOTS,
) )
cxx_library( cxx_library(

View File

@@ -22,6 +22,6 @@ cxx_library(
("googletest/googletest", "src/*.cc"), ("googletest/googletest", "src/*.cc"),
]), ]),
header_namespace = "", header_namespace = "",
visibility = [YOGA_ROOT], visibility = YOGA_ROOTS,
deps = [], deps = [],
) )

View File

@@ -17,5 +17,5 @@ java_library(
exported_deps = [ exported_deps = [
":infer-annotations-jar", ":infer-annotations-jar",
], ],
visibility = [YOGA_ROOT], visibility = YOGA_ROOTS,
) )

View File

@@ -17,5 +17,5 @@ java_library(
exported_deps = [ exported_deps = [
":jsr305-jar", ":jsr305-jar",
], ],
visibility = [YOGA_ROOT], visibility = YOGA_ROOTS,
) )

View File

@@ -17,5 +17,5 @@ java_library(
exported_deps = [ exported_deps = [
":junit-jar", ":junit-jar",
], ],
visibility = [YOGA_ROOT], visibility = YOGA_ROOTS,
) )

View File

@@ -10,5 +10,5 @@ include_defs("//YOGA_DEFS")
android_prebuilt_aar( android_prebuilt_aar(
name = "soloader", name = "soloader",
aar = "soloader-0.1.0.aar", aar = "soloader-0.1.0.aar",
visibility = [YOGA_ROOT], visibility = YOGA_ROOTS,
) )