From 0a46e5efada5f0be8f2e8ebf721178e685bf5925 Mon Sep 17 00:00:00 2001 From: Alex Malyshev Date: Mon, 20 Sep 2021 08:50:12 -0700 Subject: [PATCH] Merge base AppleTVOS flags into base Apple flags (take #3) Summary: Previous iterations of this diff that were reverted: D30678341 (https://github.com/facebook/react-native/commit/800945982fae92c859f4525e777d016bb61b138b), D30868627 (https://github.com/facebook/react-native/commit/abd0f387cd9b60887d5d8ad986e7cbda7a49ec40). With the power of selects, we can move the base AppleTVOS flags into the regular base Apple flags. While I'm here, drop the third `p` in `get_application_apppletvos_flags()` as it's driving me insane. Note - This puts get_visibility_option() on all Apple builds. I believe this is the right thing to do as everything except macOS static libraries already do it, and it shouldn't affect binaries. Changelog: [Internal] Reviewed By: mzlee, jdonald Differential Revision: D31024459 fbshipit-source-id: be85296cda3612836c1c74632dc52f6e3f89512e --- BUCK | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/BUCK b/BUCK index 0b338cccef..9434d821f8 100644 --- a/BUCK +++ b/BUCK @@ -1,7 +1,6 @@ load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native") -load("//tools/build_defs/apple:config_utils_defs.bzl", "STATIC_LIBRARY_APPLETVOS_CONFIG", "fbobjc_configs") load("//tools/build_defs/apple:fb_apple_test.bzl", "fb_apple_test") -load("//tools/build_defs/apple:flag_defs.bzl", "get_base_appletvos_flags", "get_objc_arc_preprocessor_flags", "get_preprocessor_flags_for_build_mode", "get_static_library_ios_flags") +load("//tools/build_defs/apple:flag_defs.bzl", "get_objc_arc_preprocessor_flags", "get_preprocessor_flags_for_build_mode", "get_static_library_ios_flags") load("//tools/build_defs/apple/plugins:plugin_defs.bzl", "plugin") load("//tools/build_defs/oss:metro_defs.bzl", "rn_library") load( @@ -184,8 +183,6 @@ rn_xplat_cxx_library2( prefix = "React", ), apple_sdks = (IOS, APPLETVOS), - appletvos_configs = fbobjc_configs(STATIC_LIBRARY_APPLETVOS_CONFIG), - appletvos_inherited_buck_flags = get_base_appletvos_flags(), contacts = ["oncall+react_native@xmail.facebook.com"], fbobjc_enable_exceptions = True, frameworks = [