Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_43355755
engine
提交
518c9e09
E
engine
项目概览
weixin_43355755
/
engine
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
E
engine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
518c9e09
编写于
3月 23, 2020
作者:
C
Chinmay Garde
提交者:
GitHub
3月 23, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove checks for the always true using_fuchsia_sdk flag in all GN files. (#17261)
上级
1eea062c
变更
14
隐藏空白更改
内联
并排
Showing
14 changed file
with
48 addition
and
136 deletion
+48
-136
BUILD.gn
BUILD.gn
+3
-3
common/config.gni
common/config.gni
+4
-7
common/fuchsia_config.gni
common/fuchsia_config.gni
+1
-1
flow/BUILD.gn
flow/BUILD.gn
+5
-14
fml/BUILD.gn
fml/BUILD.gn
+9
-20
lib/snapshot/BUILD.gn
lib/snapshot/BUILD.gn
+6
-23
lib/ui/BUILD.gn
lib/ui/BUILD.gn
+5
-9
shell/common/BUILD.gn
shell/common/BUILD.gn
+1
-4
shell/platform/BUILD.gn
shell/platform/BUILD.gn
+3
-5
shell/platform/fuchsia/BUILD.gn
shell/platform/fuchsia/BUILD.gn
+1
-1
shell/platform/fuchsia/flutter/BUILD.gn
shell/platform/fuchsia/flutter/BUILD.gn
+3
-14
shell/testing/BUILD.gn
shell/testing/BUILD.gn
+1
-5
sky/packages/sky_engine/BUILD.gn
sky/packages/sky_engine/BUILD.gn
+0
-20
vulkan/BUILD.gn
vulkan/BUILD.gn
+6
-10
未找到文件。
BUILD.gn
浏览文件 @
518c9e09
...
...
@@ -19,7 +19,7 @@ group("flutter") {
public_deps = []
if (!
(is_fuchsia && using_fuchsia_sdk)
) {
if (!
is_fuchsia
) {
public_deps += [
"//flutter/lib/snapshot:generate_snapshot_bin",
"//flutter/lib/snapshot:kernel_platform_files",
...
...
@@ -40,14 +40,14 @@ group("flutter") {
public_deps += [ "//flutter/tools/const_finder" ]
}
if (is_fuchsia
&& using_fuchsia_sdk
) {
if (is_fuchsia) {
public_deps += [
"//flutter/shell/platform/fuchsia",
"//flutter/shell/testing($host_toolchain)",
]
}
if (!is_fuchsia
&& !is_fuchsia_host
) {
if (!is_fuchsia) {
if (current_toolchain == host_toolchain) {
public_deps += [
"//flutter/flutter_frontend_server:frontend_server",
...
...
common/config.gni
浏览文件 @
518c9e09
...
...
@@ -12,12 +12,8 @@ if (target_cpu == "arm" || target_cpu == "arm64") {
import("//build/config/arm.gni")
}
if (is_ios || is_mac) {
if (using_fuchsia_sdk) {
import("//build/toolchain/clang.gni")
} else {
import("//build/toolchain/clang_toolchain.gni")
}
if (is_fuchsia) {
import("//build/toolchain/clang.gni")
}
declare_args() {
...
...
@@ -64,7 +60,8 @@ if (flutter_runtime_mode == "debug") {
feature_defines_list += [ "FLUTTER_RUNTIME_MODE=0" ]
}
if (is_fuchsia && using_fuchsia_sdk) {
if (is_fuchsia) {
# TODO(chinmaygarde): This is always set. The macro may now be removed.
feature_defines_list += [ "FUCHSIA_SDK=1" ]
}
...
...
common/fuchsia_config.gni
浏览文件 @
518c9e09
...
...
@@ -4,7 +4,7 @@
import("config.gni")
if (is_fuchsia
&& using_fuchsia_sdk
) {
if (is_fuchsia) {
dart_tools_root = "//flutter/tools/fuchsia/dart"
fuchsia_base = "//flutter/shell/platform/fuchsia"
flutter_runner_base = "$fuchsia_base/flutter/"
...
...
flow/BUILD.gn
浏览文件 @
518c9e09
...
...
@@ -86,20 +86,11 @@ source_set("flow") {
"view_holder.h",
]
if (using_fuchsia_sdk) {
public_deps += [
"$fuchsia_sdk_root/fidl:fuchsia.ui.app",
"$fuchsia_sdk_root/fidl:fuchsia.ui.gfx",
"$fuchsia_sdk_root/pkg:scenic_cpp",
]
} else {
public_deps += [
"//garnet/public/lib/ui/scenic/cpp",
"//sdk/fidl/fuchsia.ui.scenic",
"//topaz/public/dart-pkg/zircon",
"//zircon/public/lib/zx",
]
}
public_deps += [
"$fuchsia_sdk_root/fidl:fuchsia.ui.app",
"$fuchsia_sdk_root/fidl:fuchsia.ui.gfx",
"$fuchsia_sdk_root/pkg:scenic_cpp",
]
}
}
...
...
fml/BUILD.gn
浏览文件 @
518c9e09
...
...
@@ -180,25 +180,14 @@ source_set("fml") {
"platform/fuchsia/paths_fuchsia.cc",
]
if (using_fuchsia_sdk) {
public_deps += [
"$fuchsia_sdk_root/pkg:async-cpp",
"$fuchsia_sdk_root/pkg:async-loop-cpp",
"$fuchsia_sdk_root/pkg:async-loop-default",
"$fuchsia_sdk_root/pkg:trace",
"$fuchsia_sdk_root/pkg:trace-engine",
"$fuchsia_sdk_root/pkg:zx",
]
} else {
public_deps += [
"//zircon/public/lib/async-cpp",
"//zircon/public/lib/async-loop-cpp",
"//zircon/public/lib/async-loop-default",
"//zircon/public/lib/trace",
"//zircon/public/lib/trace-engine",
"//zircon/public/lib/zx",
]
}
public_deps += [
"$fuchsia_sdk_root/pkg:async-cpp",
"$fuchsia_sdk_root/pkg:async-loop-cpp",
"$fuchsia_sdk_root/pkg:async-loop-default",
"$fuchsia_sdk_root/pkg:trace",
"$fuchsia_sdk_root/pkg:trace-engine",
"$fuchsia_sdk_root/pkg:zx",
]
}
if (is_win) {
...
...
@@ -278,7 +267,7 @@ executable("fml_unittests") {
"//flutter/testing",
]
if (is_fuchsia
&& using_fuchsia_sdk
) {
if (is_fuchsia) {
libs = [ "${fuchsia_sdk_path}/arch/${target_cpu}/sysroot/lib/libzircon.so" ]
}
}
...
...
lib/snapshot/BUILD.gn
浏览文件 @
518c9e09
...
...
@@ -30,12 +30,7 @@ compiled_action("generate_snapshot_bin") {
tool = "//third_party/dart/runtime/bin:gen_snapshot"
}
if ((is_fuchsia || is_fuchsia_host) && !using_fuchsia_sdk) {
platform_kernel =
"$root_out_dir/flutter_runner_patched_sdk/platform_strong.dill"
} else {
platform_kernel = "$root_out_dir/flutter_patched_sdk/platform_strong.dill"
}
platform_kernel = "$root_out_dir/flutter_patched_sdk/platform_strong.dill"
inputs = [
platform_kernel,
...
...
@@ -217,11 +212,7 @@ bin_to_linkable("platform_strong_dill_linkable") {
deps = [
":kernel_platform_files",
]
if ((is_fuchsia || is_fuchsia_host) && !using_fuchsia_sdk) {
input = "$root_out_dir/flutter_runner_patched_sdk/platform_strong.dill"
} else {
input = "$root_out_dir/flutter_patched_sdk/platform_strong.dill"
}
input = "$root_out_dir/flutter_patched_sdk/platform_strong.dill"
symbol = "kPlatformStrongDill"
size_symbol = "kPlatformStrongDillSize"
executable = false
...
...
@@ -283,16 +274,8 @@ compile_platform("strong_platform") {
}
# Fuchsia's snapshot requires a different platform with extra dart: libraries.
if ((is_fuchsia || is_fuchsia_host) && !using_fuchsia_sdk) {
group("kernel_platform_files") {
public_deps = [
"//topaz/runtime/flutter_runner/kernel:kernel_platform_files",
]
}
} else {
group("kernel_platform_files") {
public_deps = [
":strong_platform",
]
}
group("kernel_platform_files") {
public_deps = [
":strong_platform",
]
}
lib/ui/BUILD.gn
浏览文件 @
518c9e09
...
...
@@ -135,15 +135,11 @@ source_set("ui") {
"compositing/scene_host.h",
]
if (using_fuchsia_sdk) {
deps += [
"$fuchsia_sdk_root/pkg:async-cpp",
"//flutter/shell/platform/fuchsia/dart-pkg/fuchsia",
"//flutter/shell/platform/fuchsia/dart-pkg/zircon",
]
} else {
deps += [ "//topaz/public/dart-pkg/zircon" ]
}
deps += [
"$fuchsia_sdk_root/pkg:async-cpp",
"//flutter/shell/platform/fuchsia/dart-pkg/fuchsia",
"//flutter/shell/platform/fuchsia/dart-pkg/zircon",
]
}
}
...
...
shell/common/BUILD.gn
浏览文件 @
518c9e09
...
...
@@ -12,11 +12,8 @@ if (is_fuchsia) {
}
config("vulkan_config") {
if (
using_fuchsia_sdk
) {
if (
is_fuchsia
) {
include_dirs = [ "$fuchsia_sdk_root/vulkan/include" ]
} else if (is_fuchsia) {
include_dirs =
[ "//third_party/vulkan_loader_and_validation_layers/include" ]
} else {
include_dirs = [ "//third_party/vulkan/src" ]
}
...
...
shell/platform/BUILD.gn
浏览文件 @
518c9e09
...
...
@@ -27,11 +27,9 @@ group("platform") {
"windows",
]
} else if (is_fuchsia) {
if (using_fuchsia_sdk) {
deps = [
"fuchsia",
]
}
deps = [
"fuchsia",
]
} else {
assert(false, "Unknown/Unsupported platform.")
}
...
...
shell/platform/fuchsia/BUILD.gn
浏览文件 @
518c9e09
...
...
@@ -7,7 +7,7 @@ import("//flutter/common/config.gni")
import("//flutter/tools/fuchsia/dart.gni")
import("//flutter/tools/fuchsia/fuchsia_host_bundle.gni")
if (
using_fuchsia_sdk
) {
if (
is_fuchsia
) {
product_suffix = ""
is_product = false
...
...
shell/platform/fuchsia/flutter/BUILD.gn
浏览文件 @
518c9e09
...
...
@@ -25,17 +25,6 @@ shell_gpu_configuration("fuchsia_gpu_configuration") {
# 1. Kernel snapshot framework mode.
# 2. Profiler symbols.
# Dependencies for flutter tooling
#
# While not required to run a flutter mod, these allow interacting
# with flutter via the fx tool and need to be built.
#
# This is only for builds in topaz tree.
flutter_tool_deps = []
if (!using_fuchsia_sdk) {
flutter_tool_deps += [ "//third_party/dart-pkg/git/flutter/packages/flutter_tools:fuchsia_attach($host_toolchain)" ]
}
flutter_runner("jit") {
output_name = "flutter_jit_runner"
product = false
...
...
@@ -50,9 +39,9 @@ flutter_runner("jit") {
}
extra_deps = [
"//third_party/dart/runtime:libdart_jit",
"//third_party/dart/runtime/platform:libdart_platform_jit",
] + flutter_tool_deps
"//third_party/dart/runtime:libdart_jit",
"//third_party/dart/runtime/platform:libdart_platform_jit",
]
}
flutter_runner("jit_product") {
...
...
shell/testing/BUILD.gn
浏览文件 @
518c9e09
...
...
@@ -29,10 +29,6 @@ executable("testing") {
]
if (is_fuchsia) {
if (!using_fuchsia_sdk) {
deps += [ "//garnet/public/lib/ui/scenic:client" ]
} else {
deps += [ "$fuchsia_sdk_root/pkg:scenic_cpp" ]
}
deps += [ "$fuchsia_sdk_root/pkg:scenic_cpp" ]
}
}
sky/packages/sky_engine/BUILD.gn
浏览文件 @
518c9e09
...
...
@@ -229,23 +229,3 @@ dart_pkg("sky_engine") {
"$service_isolate_dir/vmservice_server.dart",
]
}
if (is_fuchsia && !using_fuchsia_sdk) {
import("//build/dart/dart_library.gni")
dart_library("sky_engine_dart") {
package_name = "sky_engine"
package_root = "$root_gen_dir/dart-pkg/sky_engine"
sources = []
disable_analysis = true
non_dart_deps = [
# This will ensure all the source files needed for this package are
# copied to the right location.
":sky_engine",
]
}
}
vulkan/BUILD.gn
浏览文件 @
518c9e09
...
...
@@ -5,17 +5,13 @@
import("//build/fuchsia/sdk.gni")
config("vulkan_config") {
if (using_fuchsia_sdk) {
include_dirs = [ "$fuchsia_sdk_root/vulkan/include" ]
} else if (is_fuchsia) {
include_dirs =
[ "//third_party/vulkan_loader_and_validation_layers/include" ]
} else {
include_dirs = [ "//third_party/vulkan/src" ]
}
include_dirs = []
defines = []
if (is_fuchsia) {
defines = [ "VK_USE_PLATFORM_FUCHSIA=1" ]
include_dirs += [ "$fuchsia_sdk_root/vulkan/include" ]
defines += [ "VK_USE_PLATFORM_FUCHSIA=1" ]
} else {
include_dirs += [ "//third_party/vulkan/src" ]
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录