Skip to content

Commit

Permalink
Cherry pick PR #657: Fix tvOS build (#735)
Browse files Browse the repository at this point in the history
Inadvertently bringing in mac libs that don't belong.

b/287687154

Change-Id: I4cd64e8805ce4f71c900f77b93a68a84518c79be
(cherry picked from commit 1b0ff86)

Co-authored-by: Joel Martinez <[email protected]>
Co-authored-by: Joel Martinez <[email protected]>
  • Loading branch information
3 people authored Jun 27, 2023
1 parent cb5ee08 commit 2ce988f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions components/crash/core/common/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ group("common") {
":crash_key_utils",
]

if (is_mac || is_ios) {
if ((is_mac || is_ios) && !use_cobalt_customizations) {
public_deps += [ ":zombies" ]
}
}
Expand Down Expand Up @@ -106,7 +106,7 @@ static_library("crash_key_utils") {
]
}

if (is_mac || is_ios) {
if ((is_mac || is_ios) && !use_cobalt_customizations) {
component("zombies") {
visibility = [ ":common" ]

Expand Down
2 changes: 1 addition & 1 deletion components/metrics/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ static_library("metrics") {
deps += [ ":serialization" ]
}

if (is_mac) {
if (is_mac && !use_cobalt_customizations) {
libs = [
# The below are all needed for drive_metrics_provider_mac.mm.
"CoreFoundation.framework",
Expand Down

0 comments on commit 2ce988f

Please sign in to comment.