From d02f4a94de589d91dc719e51ff6c8c5b302df184 Mon Sep 17 00:00:00 2001 From: Scott Rice Date: Wed, 31 Oct 2018 12:03:17 -0700 Subject: [PATCH] Use fb_native_wrapper for all targets Differential Revision: D12868694 fbshipit-source-id: 0dfc7d05cc0ee6b15a2534f17260e340038a1041 --- android/sample/BUCK | 3 ++- csharp/BUCK | 5 +++-- lib/appcompat/BUCK | 3 ++- lib/soloader/BUCK | 3 ++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/android/sample/BUCK b/android/sample/BUCK index 0612aca9..0989fcd6 100644 --- a/android/sample/BUCK +++ b/android/sample/BUCK @@ -4,6 +4,7 @@ # This source code is licensed under the license found in the # LICENSE-examples file in the root directory of this source tree. +load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") load("//tools/build_defs/oss:yoga_defs.bzl", "ANDROID_RES_TARGET", "ANDROID_SAMPLE_JAVA_TARGET", "ANDROID_SAMPLE_RES_TARGET", "yoga_android_binary", "yoga_android_resource") yoga_android_binary( @@ -28,7 +29,7 @@ yoga_android_resource( ], ) -keystore( +fb_native.keystore( name = "debug_keystore", properties = "debug.keystore.properties", store = "debug.keystore", diff --git a/csharp/BUCK b/csharp/BUCK index 5f93cbe2..685b227f 100644 --- a/csharp/BUCK +++ b/csharp/BUCK @@ -3,6 +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:fb_native_wrapper.bzl", "fb_native") load( "//tools/build_defs/oss:yoga_defs.bzl", "BASE_COMPILER_FLAGS", @@ -13,14 +14,14 @@ load( COMPILER_FLAGS = BASE_COMPILER_FLAGS + ["-std=c++11"] -csharp_library( +fb_native.csharp_library( name = "yogalibnet46", srcs = glob(["**/*.cs"]), dll_name = "Facebook.Yoga.dll", framework_ver = "net46", ) -csharp_library( +fb_native.csharp_library( name = "yogalibnet45", srcs = glob(["**/*.cs"]), dll_name = "Facebook.Yoga.dll", diff --git a/lib/appcompat/BUCK b/lib/appcompat/BUCK index c1d38451..b3262494 100644 --- a/lib/appcompat/BUCK +++ b/lib/appcompat/BUCK @@ -3,9 +3,10 @@ # 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:fb_native_wrapper.bzl", "fb_native") load("//tools/build_defs/oss:yoga_defs.bzl", "YOGA_ROOTS") -android_prebuilt_aar( +fb_native.android_prebuilt_aar( name = "appcompat", aar = "appcompat-v7-24.2.1.aar", visibility = YOGA_ROOTS, diff --git a/lib/soloader/BUCK b/lib/soloader/BUCK index c96f46ed..04e2f5ff 100644 --- a/lib/soloader/BUCK +++ b/lib/soloader/BUCK @@ -3,9 +3,10 @@ # 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:fb_native_wrapper.bzl", "fb_native") load("//tools/build_defs/oss:yoga_defs.bzl", "YOGA_ROOTS") -android_prebuilt_aar( +fb_native.android_prebuilt_aar( name = "soloader", aar = "soloader-0.5.1.aar", visibility = YOGA_ROOTS,