Skip to content

Commit

Permalink
Merge base AppleTVOS flags into base Apple flags (take #3)
Browse files Browse the repository at this point in the history
Summary:
Previous iterations of this diff that were reverted: D30678341 (8009459), D30868627 (abd0f38).

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
  • Loading branch information
alexmalyshev authored and facebook-github-bot committed Sep 20, 2021
1 parent 7df5f57 commit 0a46e5e
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions BUCK
Original file line number Diff line number Diff line change
@@ -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(
Expand Down Expand Up @@ -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 = [
Expand Down

0 comments on commit 0a46e5e

Please sign in to comment.