Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ allowed_hosts = [
]

deps = {
'src': 'https://github.com/flutter/buildroot.git' + '@' + '5311c632822d0d2d4e4cf8cba3053cde5183c89c',
'src': 'https://github.com/flutter/buildroot.git' + '@' + '94695026d9a1d8963089a470eef26470312c5b00',

# Fuchsia compatibility
#
Expand Down
2 changes: 1 addition & 1 deletion shell/platform/darwin/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ group("darwin") {
}
if (is_mac) {
deps = [
"macos:flutter_framework",
"macos",
]
}
}
Expand Down
25 changes: 25 additions & 0 deletions shell/platform/darwin/macos/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,21 @@ assert(is_mac)
import("//build/config/mac/mac_sdk.gni")
import("$flutter_root/common/config.gni")
import("$flutter_root/shell/platform/darwin/framework_shared.gni")
import("$flutter_root/shell/platform/glfw/config.gni")

group("macos") {
deps = [
":flutter_framework",
]
if (build_glfw_shell) {
deps += [
":flutter_macos_glfw",
"$flutter_root/shell/platform/common/cpp/client_wrapper:publish_wrapper",
"$flutter_root/shell/platform/glfw:publish_headers_glfw",
"$flutter_root/shell/platform/glfw/client_wrapper:publish_wrapper_glfw",
]
}
}

_flutter_framework_name = "FlutterMacOS"
_flutter_framework_filename = "$_flutter_framework_name.framework"
Expand Down Expand Up @@ -194,3 +209,13 @@ group("flutter_framework") {
":_generate_symlinks",
]
}

if (build_glfw_shell) {
shared_library("flutter_macos_glfw") {
deps = [
"$flutter_root/shell/platform/glfw:flutter_glfw",
]

public_configs = [ "$flutter_root:config" ]
}
}
13 changes: 13 additions & 0 deletions shell/platform/glfw/config.gni
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Copyright 2013 The Flutter Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

declare_args() {
# Whether to build the GLFW shell for the host platform, if available.
#
# By default, the GLFW shell is not built if there is a native toolkit shell,
# but it can be enabled for supported platforms (Windows, macOS, and Linux)
# as an extra build artifact with this flag. The native toolkit shell will
# still be built as well.
build_glfw_shell = is_linux || is_win
}