Skip to content

Commit

Permalink
[Tizen] Cherrypicks from flutter-3.3.0-tizen
Browse files Browse the repository at this point in the history
  • Loading branch information
swift-kim authored and JSUYA committed Mar 14, 2024
1 parent 2e4ba9c commit 22d3663
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 40 deletions.
23 changes: 0 additions & 23 deletions .github/dependabot.yml

This file was deleted.

2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ vars = {
"checkout_llvm": False,

# Setup Git hooks by default.
'setup_githooks': True,
'setup_githooks': False,

# When this is true, the goma client will be downloaded from cipd, and
# the engine build will prefer to use this client over a client that is
Expand Down
2 changes: 1 addition & 1 deletion third_party/txt/src/txt/platform_linux.cc
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
namespace txt {

std::vector<std::string> GetDefaultFontFamilies() {
return {"Ubuntu", "Cantarell", "DejaVu Sans", "Liberation Sans", "Arial"};
return {"TizenDefaultFont", "SamsungOneUI"};
}

sk_sp<SkFontMgr> GetDefaultFontManager(uint32_t font_initialization_data) {
Expand Down
25 changes: 10 additions & 15 deletions tools/gn
Original file line number Diff line number Diff line change
Expand Up @@ -92,17 +92,7 @@ def to_command_line(gn_args):

def is_host_build(args):
# If target_os == None, then this is a host build.
if args.target_os is None:
return True
# For linux arm64 builds, we cross compile from x64 hosts, so the
# target_os='linux' and linux-cpu='arm64'
if args.target_os == 'linux' and args.linux_cpu == 'arm64':
return True
# The Mac and host targets are redundant. Again, necessary to disambiguate
# during cross-compilation.
if args.target_os == 'mac':
return True
return False
return args.target_os is None


# Determines whether a prebuilt Dart SDK can be used instead of building one.
Expand Down Expand Up @@ -544,7 +534,8 @@ def to_gn_args(args):
else:
gn_args['skia_use_gl'] = args.target_os != 'fuchsia'

if sys.platform == 'darwin' and args.target_os not in ['android', 'fuchsia']:
if sys.platform == 'darwin' and args.target_os not in ['android', 'fuchsia',
'linux']:
# OpenGL is deprecated on macOS > 10.11.
# This is not necessarily needed but enabling this until we have a way to
# build a macOS metal only shell and a gl only shell.
Expand Down Expand Up @@ -644,8 +635,8 @@ def to_gn_args(args):

# Enable pointer compression on 64-bit mobile targets. iOS is excluded due to
# its inability to allocate address space without allocating memory.
if args.target_os in ['android'] and gn_args['target_cpu'] in ['x64', 'arm64'
]:
if args.target_os in ['android', 'linux'
] and gn_args['target_cpu'] in ['x64', 'arm64']:
gn_args['dart_use_compressed_pointers'] = True

if args.fuchsia_target_api_level is not None:
Expand All @@ -656,6 +647,10 @@ def to_gn_args(args):
'fuchsia/target_api_level')) as file:
gn_args['fuchsia_target_api_level'] = int(file.read().strip())

# Don't use the default Linux sysroot when buliding for Linux on macOS.
if sys.platform == 'darwin' and args.target_os == 'linux':
gn_args['use_default_linux_sysroot'] = False

# Flags for Dart features:
if args.use_mallinfo2:
gn_args['dart_use_mallinfo2'] = args.use_mallinfo2
Expand Down Expand Up @@ -697,7 +692,7 @@ def to_gn_args(args):
# for a host Windows build and make GN think we will be building ANGLE.
# Angle is not used on Mac hosts as there are no tests for the OpenGL backend.
if (is_host_build(args) and
gn_args['host_os'] != 'mac') or (args.target_os == 'android' and
gn_args['host_os'] != 'mac') or (args.target_os == 'linux' and
get_host_os() == 'win'):
# Do not build unnecessary parts of the ANGLE tree.
gn_args['angle_build_all'] = False
Expand Down

0 comments on commit 22d3663

Please sign in to comment.