Skip to content

Commit 9f3636f

Browse files
authored
build: add platform-specific conditions to the source_set in chromium_src (#47627)
* build: Add platform-specific if conditions to the source sets in chromium_src. * build: Add platform-specific if conditions to the source sets in chromium_src.
1 parent 4a89068 commit 9f3636f

File tree

1 file changed

+15
-13
lines changed

1 file changed

+15
-13
lines changed

chromium_src/BUILD.gn

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,6 @@ static_library("chrome") {
144144
"//chrome/browser/ui/views/overlay/toggle_camera_button.h",
145145
"//chrome/browser/ui/views/overlay/toggle_microphone_button.cc",
146146
"//chrome/browser/ui/views/overlay/toggle_microphone_button.h",
147-
"//chrome/browser/ui/views/overlay/video_overlay_window_native_widget_mac.h",
148-
"//chrome/browser/ui/views/overlay/video_overlay_window_native_widget_mac.mm",
149147
"//chrome/browser/ui/views/overlay/video_overlay_window_views.cc",
150148
"//chrome/browser/ui/views/overlay/video_overlay_window_views.h",
151149
"//chrome/browser/ui/views/picture_in_picture/picture_in_picture_bounds_change_animation.cc",
@@ -282,6 +280,8 @@ static_library("chrome") {
282280
"//chrome/browser/process_singleton_mac.mm",
283281
"//chrome/browser/ui/views/eye_dropper/eye_dropper_view_mac.h",
284282
"//chrome/browser/ui/views/eye_dropper/eye_dropper_view_mac.mm",
283+
"//chrome/browser/ui/views/overlay/video_overlay_window_native_widget_mac.h",
284+
"//chrome/browser/ui/views/overlay/video_overlay_window_native_widget_mac.mm",
285285
]
286286
deps += [ ":system_media_capture_permissions_mac_conflict" ]
287287
}
@@ -504,15 +504,17 @@ source_set("chrome_spellchecker") {
504504
]
505505
}
506506

507-
# These sources create an object file conflict with one in |:chrome|, so they
508-
# must live in a separate target.
509-
# Conflicting sources:
510-
# //chrome/browser/media/webrtc/system_media_capture_permissions_stats_mac.mm
511-
# //chrome/browser/permissions/system/system_media_capture_permissions_mac.mm
512-
source_set("system_media_capture_permissions_mac_conflict") {
513-
sources = [
514-
"//chrome/browser/permissions/system/system_media_capture_permissions_mac.h",
515-
"//chrome/browser/permissions/system/system_media_capture_permissions_mac.mm",
516-
]
517-
deps = [ "//chrome/common" ]
507+
if (is_mac) {
508+
# These sources create an object file conflict with one in |:chrome|, so they
509+
# must live in a separate target.
510+
# Conflicting sources:
511+
# //chrome/browser/media/webrtc/system_media_capture_permissions_stats_mac.mm
512+
# //chrome/browser/permissions/system/system_media_capture_permissions_mac.mm
513+
source_set("system_media_capture_permissions_mac_conflict") {
514+
sources = [
515+
"//chrome/browser/permissions/system/system_media_capture_permissions_mac.h",
516+
"//chrome/browser/permissions/system/system_media_capture_permissions_mac.mm",
517+
]
518+
deps = [ "//chrome/common" ]
519+
}
518520
}

0 commit comments

Comments
 (0)