From f09beeabeb5be7c4ede05625b8cb9ed57f01e506 Mon Sep 17 00:00:00 2001 From: James Donald Date: Tue, 28 Sep 2021 21:03:36 -0700 Subject: [PATCH] Merge base AppleTVOS flags into base Apple flags (take #5) 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), D31024459 (https://github.com/facebook/react-native/commit/0a46e5efada5f0be8f2e8ebf721178e685bf5925), D31147242 (https://github.com/facebook/react-native/commit/92c1bee5f9cf88c4b351778c79e45526dc52f077). With the power of selects, we can move the base AppleTVOS flags into the regular base Apple flags. Changelog: [Internal] skip-frl-buck-targeting Reviewed By: mzlee Differential Revision: D31216242 fbshipit-source-id: 93ee2afda41af06fe210ba6a4a5459a438d6c3f8 --- BUCK | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/BUCK b/BUCK index 0b338cccef6c96..9434d821f8b3aa 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 = [