提交 3507c90d 编写于 作者: J James Robinson

Update from https://crrev.com/327068

This rolls in //base, //build and //sandbox/linux and updates other
things to match, in particular:

*) Update build_v8.patch
*) Add junit, mockito and roboelectric to DEPS for android test rules
*) Update DEPS for grit
*) Fix up various GN files for os->target_os rename
*) Fix up a few places that were using //base/float_util to use std::isnan
*) Fix up a few places using ApiCompatibilityUtil to use Android SDK directly

as well as a few miscellaneous fixes.

Many portions based on ncbray's work in
https://codereview.chromium.org/1108173002/

R=ncbray@chromium.org
TBR=ncbray@chromium.org

Review URL: https://codereview.chromium.org/1124763003
上级 e3fe2a2f
......@@ -89,7 +89,7 @@ action("generate_snapshot_bin") {
"--output_bin",
rebase_path(isolate_snapshot, root_build_dir),
"--target_os",
os,
target_os,
"--url_mapping=dart:sky,$dart_sky_path",
"--url_mapping=dart:mojo.internal,$internal_path",
"--url_mapping=dart:sky_builtin,$builtin_path",
......
......@@ -39,7 +39,7 @@ public class SkyApplication extends BaseChromiumApplication {
}
private void initializeJavaUtils() {
PathUtils.setPrivateDataDirectorySuffix(PRIVATE_DATA_DIRECTORY_SUFFIX);
PathUtils.setPrivateDataDirectorySuffix(PRIVATE_DATA_DIRECTORY_SUFFIX, getApplicationContext());
}
private void initializeNative() {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册