Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
sxychenjing
engine
提交
46e06cd9
E
engine
项目概览
sxychenjing
/
engine
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
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,发现更多精彩内容 >>
提交
46e06cd9
编写于
8月 12, 2016
作者:
T
Todd Volkert
提交者:
GitHub
8月 12, 2016
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Pass `runtime_mode` gn arg through to `ShouldEnableCheckedMode()` (#2919)
https://github.com/flutter/flutter/issues/4866
上级
6ed9eac4
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
31 addition
and
40 deletion
+31
-40
sky/engine/config.gni
sky/engine/config.gni
+17
-26
sky/engine/core/BUILD.gn
sky/engine/core/BUILD.gn
+2
-2
sky/engine/core/script/dart_init.cc
sky/engine/core/script/dart_init.cc
+10
-10
sky/shell/shell.cc
sky/shell/shell.cc
+1
-1
tools/gn
tools/gn
+1
-1
未找到文件。
sky/engine/config.gni
浏览文件 @
46e06cd9
...
...
@@ -17,27 +17,30 @@ declare_args() {
# Enable asserts, even in release builds.
sky_asserts_always_on = false
# Experimental support for the Dart VM.
sky_use_dart = false
# Default to strict mode in debug builds.
if (is_debug) {
sky_dart_strict_mode = true
} else {
sky_dart_strict_mode = false
}
# Enable ahead-of-time compilation on platforms where AOT is optional.
flutter_aot = false
# Set if the Dart runtime is being built in product mode, which excludes
# development features such as the debugger.
flutter_product_mode = false
# The runtime mode ("debug", "profile", or "release")
flutter_runtime_mode = "debug"
}
# feature_defines_list ---------------------------------------------------------
feature_defines_list = []
feature_defines_list = [
"FLUTTER_RUNTIME_MODE_DEBUG=1",
"FLUTTER_RUNTIME_MODE_PROFILE=2",
"FLUTTER_RUNTIME_MODE_RELEASE=3",
]
if (flutter_runtime_mode == "debug") {
feature_defines_list += [ "FLUTTER_RUNTIME_MODE=1" ]
} else if (flutter_runtime_mode == "profile") {
feature_defines_list += [ "FLUTTER_RUNTIME_MODE=2" ]
} else if (flutter_runtime_mode == "release") {
feature_defines_list += [ "FLUTTER_RUNTIME_MODE=3" ]
} else {
feature_defines_list += [ "FLUTTER_RUNTIME_MODE=0" ]
}
if (is_debug) {
# TODO(GYP) this should also be set when release_valgrind_build is set,
...
...
@@ -54,18 +57,6 @@ if (sky_asserts_always_on) {
feature_defines_list += [ "ENABLE_ASSERT=1" ]
}
if (sky_dart_strict_mode) {
feature_defines_list += [ "ENABLE_DART_STRICT=1" ]
}
if (sky_use_dart) {
feature_defines_list += [ "WTF_USE_DART=1" ]
}
if (flutter_aot) {
feature_defines_list += [ "FLUTTER_AOT=1" ]
}
if (flutter_product_mode) {
feature_defines_list += [ "FLUTTER_PRODUCT_MODE=1" ]
}
sky/engine/core/BUILD.gn
浏览文件 @
46e06cd9
...
...
@@ -90,8 +90,8 @@ static_library("core") {
"//flutter/services/pointer:interfaces",
]
if (
!flutter_product_mode
) {
# Only include observatory assets in non-
product
modes.
if (
flutter_runtime_mode != "release"
) {
# Only include observatory assets in non-
release
modes.
deps += [
"//dart/runtime/observatory:embedded_observatory_archive",
]
...
...
sky/engine/core/script/dart_init.cc
浏览文件 @
46e06cd9
...
...
@@ -50,7 +50,7 @@ using tonic::ToDart;
namespace
dart
{
namespace
observatory
{
#if
!FLUTTER_PRODUCT_MOD
E
#if
FLUTTER_RUNTIME_MODE != FLUTTER_RUNTIME_MODE_RELEAS
E
// These two symbols are defined in |observatory_archive.cc| which is generated
// by the |//dart/runtime/observatory:archive_observatory| rule. Both of these
...
...
@@ -58,7 +58,7 @@ namespace observatory {
extern
unsigned
int
observatory_assets_archive_len
;
extern
const
uint8_t
*
observatory_assets_archive
;
#endif //
!FLUTTER_PRODUCT_MOD
E
#endif //
FLUTTER_RUNTIME_MODE != FLUTTER_RUNTIME_MODE_RELEAS
E
}
// namespace observatory
}
// namespace dart
...
...
@@ -164,14 +164,14 @@ bool IsServiceIsolateURL(const char* url_name) {
String
(
url_name
)
==
DART_VM_SERVICE_ISOLATE_NAME
;
}
#if
def FLUTTER_PRODUCT_MOD
E
#if
FLUTTER_RUNTIME_MODE == FLUTTER_RUNTIME_MODE_RELEAS
E
Dart_Isolate
ServiceIsolateCreateCallback
(
const
char
*
script_uri
,
char
**
error
)
{
return
nullptr
;
}
#else // FLUTTER_
PRODUCT
_MODE
#else // FLUTTER_
RUNTIME
_MODE
Dart_Isolate
ServiceIsolateCreateCallback
(
const
char
*
script_uri
,
char
**
error
)
{
...
...
@@ -216,7 +216,7 @@ Dart_Isolate ServiceIsolateCreateCallback(const char* script_uri,
return
isolate
;
}
#endif // FLUTTER_
PRODUCT
_MODE
#endif // FLUTTER_
RUNTIME
_MODE
Dart_Isolate
IsolateCreateCallback
(
const
char
*
script_uri
,
const
char
*
main
,
...
...
@@ -287,13 +287,13 @@ Dart_Isolate IsolateCreateCallback(const char* script_uri,
}
Dart_Handle
GetVMServiceAssetsArchiveCallback
()
{
#if FLUTTER_
PRODUCT_MOD
E
#if FLUTTER_
RUNTIME_MODE == FLUTTER_RUNTIME_MODE_RELEAS
E
return
nullptr
;
#else // FLUTTER_
PRODUCT
_MODE
#else // FLUTTER_
RUNTIME
_MODE
return
tonic
::
DartConverter
<
tonic
::
Uint8List
>::
ToDart
(
::
dart
::
observatory
::
observatory_assets_archive
,
::
dart
::
observatory
::
observatory_assets_archive_len
);
#endif // FLUTTER_
PRODUCT
_MODE
#endif // FLUTTER_
RUNTIME
_MODE
}
static
const
char
kStdoutStreamId
[]
=
"Stdout"
;
...
...
@@ -503,7 +503,7 @@ static bool ShouldEnableCheckedMode() {
return
false
;
}
#if
ENABLE(DART_STRICT)
#if
FLUTTER_RUNTIME_MODE == FLUTTER_RUNTIME_MODE_DEBUG
return
true
;
#else
return
Settings
::
Get
().
enable_dart_checked_mode
;
...
...
@@ -557,7 +557,7 @@ void InitDartVM() {
FTL_CHECK
(
Dart_SetVMFlags
(
args
.
size
(),
args
.
data
()));
#if
ndef FLUTTER_PRODUCT_MOD
E
#if
FLUTTER_RUNTIME_MODE != FLUTTER_RUNTIME_MODE_RELEAS
E
{
TRACE_EVENT0
(
"flutter"
,
"DartDebugger::InitDebugger"
);
// This should be called before calling Dart_Initialize.
...
...
sky/shell/shell.cc
浏览文件 @
46e06cd9
...
...
@@ -175,7 +175,7 @@ void Shell::InitStandalone(std::string icu_data_path) {
void
Shell
::
Init
()
{
base
::
DiscardableMemoryAllocator
::
SetInstance
(
&
g_discardable
.
Get
());
#if
ndef FLUTTER_PRODUCT_MOD
E
#if
FLUTTER_RUNTIME_MODE != FLUTTER_RUNTIME_MODE_RELEAS
E
InitSkiaEventTracer
();
#endif
...
...
tools/gn
浏览文件 @
46e06cd9
...
...
@@ -91,7 +91,7 @@ def to_gn_args(args):
use_dbc
=
args
.
target_os
==
'ios'
and
not
args
.
simulator
and
args
.
runtime_mode
==
'debug'
gn_args
[
'dart_experimental_interpreter'
]
=
use_dbc
gn_args
[
'flutter_
product_mode'
]
=
(
gn_args
[
'dart_runtime_mode'
]
==
'release'
)
gn_args
[
'flutter_
runtime_mode'
]
=
args
.
runtime_mode
if
args
.
target_sysroot
:
gn_args
[
'target_sysroot'
]
=
args
.
target_sysroot
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录