From 9b8323ff38e39561a0415af5c953734d01bbf223 Mon Sep 17 00:00:00 2001 From: Jakub Grzmiel Date: Sat, 14 Apr 2018 15:27:04 -0700 Subject: [PATCH] Clean up BUCK files for missing dependencies and tests Summary: Several of dependencies and tests in repository are missing (e.g. because we don't support building certain library for MacOSX). Clean up those mistakes. Differential Revision: D7625433 fbshipit-source-id: 332b7ff7eaed82cb52f459921f1ae67b702a1636 --- benchmark/BUCK | 3 ++- csharp/BUCK | 6 +++--- yoga_defs.bzl | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/benchmark/BUCK b/benchmark/BUCK index 36055bfa..e4ebc8fd 100644 --- a/benchmark/BUCK +++ b/benchmark/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("//:yoga_defs.bzl", "yoga_dep") +load("//:yoga_defs.bzl", "yoga_dep", "ANDROID", "APPLE") cxx_binary( name = "benchmark", @@ -18,6 +18,7 @@ cxx_binary( "-O3", "-std=c11", ], + platforms = (ANDROID, APPLE), visibility = ["PUBLIC"], deps = [ yoga_dep(":yoga"), diff --git a/csharp/BUCK b/csharp/BUCK index 397a0900..aa610fab 100644 --- a/csharp/BUCK +++ b/csharp/BUCK @@ -42,9 +42,9 @@ if is_apple_platform(): genrule( name = name, srcs = [ - yoga_dep(':yoga#%s,static' % arch), + yoga_dep(':yogaApple#%s,static' % arch), yoga_dep('YogaKit:YogaKitApple#%s,static' % arch), - yoga_dep('csharp:yoganet#%s,static' % arch), + yoga_dep('csharp:yoganetApple#%s,static' % arch), ], out = 'libyoga-%s.a' % arch, cmd = 'libtool -static -o $OUT $SRCS', @@ -59,7 +59,7 @@ if is_apple_platform(): visibility = ['PUBLIC'], ) - yoganet_macosx_target = 'csharp:yoganet#macosx-%s,dynamic' + yoganet_macosx_target = 'csharp:yoganetAppleMac#macosx-%s,dynamic' genrule( name = 'yoganet-macosx', srcs = [ diff --git a/yoga_defs.bzl b/yoga_defs.bzl index 21e00019..d1adb090 100644 --- a/yoga_defs.bzl +++ b/yoga_defs.bzl @@ -12,6 +12,7 @@ JNI_TARGET = '//lib/jni:jni' FBJNI_TARGET = '//lib/fb:fbjni' FBJNI_JAVA_TARGET = '//lib/fb/src/main/java/com/facebook/jni:jni' APPCOMPAT_TARGET = '//lib/appcompat:appcompat' +APPLE = '' ANDROID = '' ANDROID_SUPPORT_TARGET = '//lib/android-support:android-support' ANDROID_TARGET = '//android:android'