From 477fedd1b64ad4ac45ef12ef1ea82966fdb7ceeb Mon Sep 17 00:00:00 2001
From: Aniket Mathur <aniketm@fb.com>
Date: Mon, 31 Jan 2022 16:59:28 -0800
Subject: [PATCH] Rollout to xplat/{t..z}

Reviewed By: mzlee

Differential Revision: D33810211

fbshipit-source-id: c1a437a3834701d79461365ef503eee9fa4e75bd
---
 java/BUCK     | 4 ++--
 lib/fb/BUCK   | 2 +-
 testutil/BUCK | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/java/BUCK b/java/BUCK
index 9306bc80..07b653db 100644
--- a/java/BUCK
+++ b/java/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("//tools/build_defs/oss:yoga_defs.bzl", "ANDROID", "CXX_LIBRARY_WHITELIST", "JNI_TARGET", "JSR_305_TARGET", "JUNIT_TARGET", "PROGUARD_ANNOTATIONS_TARGET", "SOLOADER_TARGET", "YOGA_ROOTS", "yoga_android_dep", "yoga_cxx_library", "yoga_dep", "yoga_java_binary", "yoga_java_library", "yoga_java_test", "yoga_prebuilt_cxx_library")
+load("//tools/build_defs/oss:yoga_defs.bzl", "ANDROID", "CXX", "CXX_LIBRARY_WHITELIST", "JNI_TARGET", "JSR_305_TARGET", "JUNIT_TARGET", "PROGUARD_ANNOTATIONS_TARGET", "SOLOADER_TARGET", "YOGA_ROOTS", "yoga_android_dep", "yoga_cxx_library", "yoga_dep", "yoga_java_binary", "yoga_java_library", "yoga_java_test", "yoga_prebuilt_cxx_library")
 
 CXX_LIBRARY_WHITELIST_FOR_TESTS = CXX_LIBRARY_WHITELIST + [
     yoga_android_dep("testutil:jni"),
@@ -46,7 +46,7 @@ yoga_cxx_library(
         "-Os",
         "-std=c++11",
     ],
-    platforms = ANDROID,
+    platforms = (CXX, ANDROID),
     preprocessor_flags = [
         "-DFBJNI_WITH_FAST_CALLS",
     ],
diff --git a/lib/fb/BUCK b/lib/fb/BUCK
index 851e749f..f283dca1 100644
--- a/lib/fb/BUCK
+++ b/lib/fb/BUCK
@@ -37,7 +37,7 @@ yoga_cxx_library(
         "-Wno-unused-variable",
         "-std=c++11",
     ],
-    platforms = (ANDROID,),
+    platforms = (CXX, ANDROID),
     soname = "libfbjni.$(ext)",
     visibility = ["PUBLIC"],
     deps = [
diff --git a/testutil/BUCK b/testutil/BUCK
index 1a66f91b..b1712055 100644
--- a/testutil/BUCK
+++ b/testutil/BUCK
@@ -1,4 +1,4 @@
-load("//tools/build_defs/oss:yoga_defs.bzl", "ANDROID", "FBJNI_TARGET", "LIBRARY_COMPILER_FLAGS", "SOLOADER_TARGET", "subdir_glob", "yoga_cxx_library", "yoga_dep", "yoga_java_library")
+load("//tools/build_defs/oss:yoga_defs.bzl", "ANDROID", "CXX", "FBJNI_TARGET", "LIBRARY_COMPILER_FLAGS", "SOLOADER_TARGET", "subdir_glob", "yoga_cxx_library", "yoga_dep", "yoga_java_library")
 
 yoga_cxx_library(
     name = "testutil",
@@ -17,7 +17,7 @@ yoga_cxx_library(
     header_namespace = "",
     exported_headers = subdir_glob([("src/main/cpp/include", "yoga/testutil/testutil.h")]),
     compiler_flags = LIBRARY_COMPILER_FLAGS,
-    platforms = ANDROID,
+    platforms = (CXX, ANDROID),
     soname = "libyoga_testutil.$(ext)",
     visibility = ["PUBLIC"],
     deps = [
@@ -43,7 +43,7 @@ yoga_cxx_library(
     srcs = ["src/main/cpp/jni/jni.cpp"],
     allow_jni_merging = False,
     compiler_flags = LIBRARY_COMPILER_FLAGS,
-    platforms = ANDROID,
+    platforms = (CXX, ANDROID),
     soname = "libyoga_testutil_jni.$(ext)",
     visibility = ["PUBLIC"],
     deps = [