Migrate yoga defs to Skylark syntax.

Summary: https://our.intern.facebook.com/intern/dex/buck/python-to-skylark/ Reviewed By: adamjernst Differential Revision: D6411822 fbshipit-source-id: 2abe2c183d1b1a28349d0c7bd765754688ec4441
Tamerlx · Nov 27, 2017 · dec1172 · dec1172
1 parent afaafb4
commit dec1172
Show file tree

Hide file tree

Showing 20 changed files with 21 additions and 24 deletions.
diff --git a/BUCK b/BUCK
@@ -5,7 +5,7 @@
 # LICENSE file in the root directory of this source tree. An additional grant
 # of patent rights can be found in the PATENTS file in the same directory.
 
-include_defs("//YOGA_DEFS")
+include_defs("//yoga_defs.bzl")
 
 GMOCK_OVERRIDE_FLAGS = [
     # gmock does not mark mocked methods as override, ignore the warnings in tests

diff --git a/YogaKit/BUCK b/YogaKit/BUCK
@@ -5,7 +5,7 @@
 # LICENSE file in the root directory of this source tree. An additional grant
 # of patent rights can be found in the PATENTS file in the same directory.
 
-include_defs("//YOGA_DEFS")
+include_defs("//yoga_defs.bzl")
 
 COMPILER_FLAGS = [
     "-fobjc-arc",

diff --git a/android/BUCK b/android/BUCK
@@ -5,7 +5,7 @@
 # LICENSE file in the root directory of this source tree. An additional grant
 # of patent rights can be found in the PATENTS file in the same directory.
 
-include_defs("//YOGA_DEFS")
+load("//:yoga_defs.bzl", "ANDROID_JAVA_TARGET", "ANDROID_RES_TARGET", "INFER_ANNOTATIONS_TARGET", "JAVA_TARGET", "PROGRUARD_ANNOTATIONS_TARGET")
 
 android_aar(
     name = "android",

diff --git a/android/sample/BUCK b/android/sample/BUCK
@@ -4,7 +4,7 @@
 # This source code is licensed under the license found in the
 # LICENSE-examples file in the root directory of this source tree.
 
-include_defs("//YOGA_DEFS")
+load("//:yoga_defs.bzl", "ANDROID_SAMPLE_JAVA_TARGET", "ANDROID_SAMPLE_RES_TARGET", "ANDROID_RES_TARGET")
 
 android_binary(
     name = "sample",

diff --git a/android/sample/java/com/facebook/samples/yoga/BUCK b/android/sample/java/com/facebook/samples/yoga/BUCK
@@ -5,7 +5,7 @@
 # LICENSE file in the root directory of this source tree. An additional grant
 # of patent rights can be found in the PATENTS file in the same directory.
 
-include_defs("//YOGA_DEFS")
+load("//:yoga_defs.bzl", "ANDROID_JAVA_TARGET", "ANDROID_SAMPLE_RES_TARGET", "ANDROID_SUPPORT_TARGET", "APPCOMPAT_TARGET", "ANDROID_SUPPORT_TARGET", "SOLOADER_TARGET")
 
 android_library(
     name = "yoga",

diff --git a/android/src/main/java/com/facebook/yoga/android/BUCK b/android/src/main/java/com/facebook/yoga/android/BUCK
@@ -5,7 +5,7 @@
 # LICENSE file in the root directory of this source tree. An additional grant
 # of patent rights can be found in the PATENTS file in the same directory.
 
-include_defs("//YOGA_DEFS")
+load("//:yoga_defs.bzl", "ANDROID_RES_TARGET", "INFER_ANNOTATIONS_TARGET", "JAVA_TARGET", "JSR_305_TARGET", "SOLOADER_TARGET")
 
 android_library(
     name = "android",

diff --git a/benchmark/BUCK b/benchmark/BUCK
@@ -5,7 +5,7 @@
 # LICENSE file in the root directory of this source tree. An additional grant
 # of patent rights can be found in the PATENTS file in the same directory.
 
-include_defs("//YOGA_DEFS")
+load("//:yoga_defs.bzl", "yoga_dep")
 
 cxx_binary(
     name = "benchmark",

diff --git a/csharp/BUCK b/csharp/BUCK
@@ -6,7 +6,7 @@
 # of patent rights can be found in the PATENTS file in the same directory.
 
 load("@xplat//configurations/buck:default_platform_defs", "is_apple_platform")
-load("//:YOGA_DEFS", "BASE_COMPILER_FLAGS", "yoga_dep", "cxx_library")
+load("//:yoga_defs.bzl", "BASE_COMPILER_FLAGS", "yoga_dep", "cxx_library")
 
 COMPILER_FLAGS = BASE_COMPILER_FLAGS + ["-std=c++11"]
 

diff --git a/java/BUCK b/java/BUCK
@@ -5,7 +5,7 @@
 # LICENSE file in the root directory of this source tree. An additional grant
 # of patent rights can be found in the PATENTS file in the same directory.
 
-include_defs("//YOGA_DEFS")
+include_defs("//yoga_defs.bzl")
 
 cxx_library(
     name = "jni",

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
@@ -5,7 +5,7 @@
 # LICENSE file in the root directory of this source tree. An additional grant
 # of patent rights can be found in the PATENTS file in the same directory.
 
-include_defs("//YOGA_DEFS")
+load("//:yoga_defs.bzl", "YOGA_ROOTS")
 
 java_library(
     name = "annotations",

diff --git a/lib/android-support/BUCK b/lib/android-support/BUCK
@@ -5,7 +5,7 @@
 # LICENSE file in the root directory of this source tree. An additional grant
 # of patent rights can be found in the PATENTS file in the same directory.
 
-include_defs("//YOGA_DEFS")
+load("//:yoga_defs.bzl", "YOGA_ROOTS")
 
 prebuilt_jar(
     name = "android-support",

diff --git a/lib/appcompat/BUCK b/lib/appcompat/BUCK
@@ -5,7 +5,7 @@
 # LICENSE file in the root directory of this source tree. An additional grant
 # of patent rights can be found in the PATENTS file in the same directory.
 
-include_defs("//YOGA_DEFS")
+load("//:yoga_defs.bzl", "YOGA_ROOTS")
 
 android_prebuilt_aar(
     name = "appcompat",

diff --git a/lib/fb/BUCK b/lib/fb/BUCK
@@ -5,7 +5,7 @@
 # LICENSE file in the root directory of this source tree. An additional grant
 # of patent rights can be found in the PATENTS file in the same directory.
 
-include_defs("//YOGA_DEFS")
+include_defs("//yoga_defs.bzl")
 
 prebuilt_cxx_library(
     name = "ndklog",

diff --git a/lib/fb/src/main/java/com/facebook/jni/BUCK b/lib/fb/src/main/java/com/facebook/jni/BUCK
@@ -5,7 +5,7 @@
 # LICENSE file in the root directory of this source tree. An additional grant
 # of patent rights can be found in the PATENTS file in the same directory.
 
-include_defs("//YOGA_DEFS")
+load("//:yoga_defs.bzl", "PROGRUARD_ANNOTATIONS_TARGET", "SOLOADER_TARGET", "JSR_305_TARGET")
 
 java_library(
     name = "jni",

diff --git a/lib/gtest/BUCK b/lib/gtest/BUCK
@@ -5,7 +5,7 @@
 # LICENSE file in the root directory of this source tree. An additional grant
 # of patent rights can be found in the PATENTS file in the same directory.
 
-include_defs("//YOGA_DEFS")
+include_defs("//yoga_defs.bzl")
 
 COMPILER_FLAGS = [
     "-std=c++11",

diff --git a/lib/infer-annotations/BUCK b/lib/infer-annotations/BUCK
@@ -5,7 +5,7 @@
 # LICENSE file in the root directory of this source tree. An additional grant
 # of patent rights can be found in the PATENTS file in the same directory.
 
-include_defs("//YOGA_DEFS")
+load("//:yoga_defs.bzl", "YOGA_ROOTS")
 
 prebuilt_jar(
     name = "infer-annotations-jar",

diff --git a/lib/jsr-305/BUCK b/lib/jsr-305/BUCK
@@ -5,7 +5,7 @@
 # LICENSE file in the root directory of this source tree. An additional grant
 # of patent rights can be found in the PATENTS file in the same directory.
 
-include_defs("//YOGA_DEFS")
+load("//:yoga_defs.bzl", "YOGA_ROOTS")
 
 prebuilt_jar(
     name = "jsr305-jar",

diff --git a/lib/junit/BUCK b/lib/junit/BUCK
@@ -5,7 +5,7 @@
 # LICENSE file in the root directory of this source tree. An additional grant
 # of patent rights can be found in the PATENTS file in the same directory.
 
-include_defs("//YOGA_DEFS")
+load("//:yoga_defs.bzl", "YOGA_ROOTS")
 
 prebuilt_jar(
     name = "junit-jar",

diff --git a/lib/soloader/BUCK b/lib/soloader/BUCK
@@ -5,7 +5,7 @@
 # LICENSE file in the root directory of this source tree. An additional grant
 # of patent rights can be found in the PATENTS file in the same directory.
 
-include_defs("//YOGA_DEFS")
+load("//:yoga_defs.bzl", "YOGA_ROOTS")
 
 android_prebuilt_aar(
     name = "soloader",

diff --git a/YOGA_DEFS → yoga_defs.bzl b/YOGA_DEFS → yoga_defs.bzl
@@ -1,3 +1,4 @@
+"""Provides macros for working with yoga library."""
 
 YOGA_ROOTS = ['//...']
 JAVA_TARGET = '//java:java'
@@ -38,10 +39,6 @@ LIBRARY_COMPILER_FLAGS = BASE_COMPILER_FLAGS + [
   '-fPIC',
 ]
 
+
 def yoga_dep(dep):
   return '//' + dep
-
-with allow_unsafe_import():
-  import os.path
-def isdir(filename):
-  return os.path.isdir(filename)