Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Re-land "Support multiple shells in a single process. (#4932)"" #4981

Merged
merged 1 commit into from
Apr 12, 2018
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
74 changes: 42 additions & 32 deletions BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,14 @@ group("flutter") {
public_deps = [
"$flutter_root/lib/snapshot:generate_snapshot_bin",
"$flutter_root/lib/snapshot:kernel_platform_files",
"$flutter_root/shell/testing",
"$flutter_root/sky",
"$flutter_root/third_party/txt",
]

if (flutter_runtime_mode != "debug") {
public_deps += [ "$flutter_root/lib/snapshot:entry_points_json_files" ]
public_deps += [
"$flutter_root/lib/snapshot:entry_points_json_files",
]
}

if (!is_fuchsia && !is_fuchsia_host) {
Expand Down Expand Up @@ -43,24 +45,20 @@ group("flutter") {
"$flutter_root/shell/platform/embedder:flutter_embedder_framework",
]
}

if (!is_win) {
public_deps += [
"$flutter_root/shell/platform/embedder:embedder_unittests",
"$flutter_root/shell/platform/embedder:flutter_engine",
]
}
public_deps += [
"$flutter_root/flow:flow_unittests",
"$flutter_root/fml:fml_unittests",
"$flutter_root/runtime:runtime_unittests",
"$flutter_root/shell/common:shell_unittests",
"$flutter_root/sky/engine/wtf:wtf_unittests",
"$flutter_root/synchronization:synchronization_unittests",
"$flutter_root/third_party/txt:txt_unittests",
"//garnet/public/lib/fxl:fxl_unittests",
]

if (!is_win) {
public_deps += [
"$flutter_root/shell/platform/embedder:embedder_unittests",
"$flutter_root/shell/platform/embedder:flutter_engine",
]
}
}
}

Expand All @@ -76,47 +74,59 @@ if (is_fuchsia) {
"$flutter_root/content_handler:aot",
]
if (flutter_runtime_mode != "release") {
deps += [ "//third_party/dart/runtime/observatory:embedded_archive_observatory" ]
deps += [
"//third_party/dart/runtime/observatory:embedded_archive_observatory",
]
}

binary = "flutter_aot_runner"

if (flutter_runtime_mode != "release") {
resources = [ {
path = rebase_path(
"$root_gen_dir/observatory/embedded_archive_observatory.tar")
dest = "observatory.tar"
} ]
resources = [
{
path = rebase_path(
"$root_gen_dir/observatory/embedded_archive_observatory.tar")
dest = "observatory.tar"
},
]
}

meta = [ {
path = rebase_path("content_handler/meta/sandbox")
dest = "sandbox"
} ]
meta = [
{
path = rebase_path("content_handler/meta/sandbox")
dest = "sandbox"
},
]
}

package("flutter_jit_runner") {
deps = [
"$flutter_root/content_handler:jit",
]
if (flutter_runtime_mode != "release") {
deps += [ "//third_party/dart/runtime/observatory:embedded_archive_observatory" ]
deps += [
"//third_party/dart/runtime/observatory:embedded_archive_observatory",
]
}

binary = "flutter_jit_runner"

if (flutter_runtime_mode != "release") {
resources = [ {
path = rebase_path(
"$root_gen_dir/observatory/embedded_archive_observatory.tar")
dest = "observatory.tar"
} ]
resources = [
{
path = rebase_path(
"$root_gen_dir/observatory/embedded_archive_observatory.tar")
dest = "observatory.tar"
},
]
}

meta = [ {
path = rebase_path("content_handler/meta/sandbox")
dest = "sandbox"
} ]
meta = [
{
path = rebase_path("content_handler/meta/sandbox")
dest = "sandbox"
},
]
}
} else {
group("dist") {
Expand Down
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ allowed_hosts = [
]

deps = {
'src': 'https://github.com/flutter/buildroot.git' + '@' + '3cf97e01cdbd4bb920fa3d40282a56c4b2d62a58',
'src': 'https://github.com/flutter/buildroot.git' + '@' + '8dddd90bf943a8174913564353b30a3b11ee0f7a',

# Fuchsia compatibility
#
Expand Down
12 changes: 6 additions & 6 deletions assets/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,16 @@

source_set("assets") {
sources = [
"asset_manager.cc",
"asset_manager.h",
"asset_resolver.h",
"asset_provider.h",
"directory_asset_bundle.cc",
"directory_asset_bundle.h",
"unzipper_provider.cc",
"unzipper_provider.h",
"zip_asset_store.cc",
"zip_asset_store.h",
]

deps = [
"$flutter_root/common",
"$flutter_root/fml",
"$flutter_root/glue",
"//garnet/public/lib/fxl",
"//garnet/public/lib/zip",
Expand All @@ -25,5 +23,7 @@ source_set("assets") {
"//third_party/zlib:minizip",
]

public_configs = [ "$flutter_root:config" ]
public_configs = [
"$flutter_root:config",
]
}
59 changes: 0 additions & 59 deletions assets/asset_manager.cc

This file was deleted.

47 changes: 0 additions & 47 deletions assets/asset_manager.h

This file was deleted.

25 changes: 25 additions & 0 deletions assets/asset_provider.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// Copyright 2018 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#ifndef FLUTTER_ASSETS_ASSET_PROVIDER_H_
#define FLUTTER_ASSETS_ASSET_PROVIDER_H_

#include <string>
#include <vector>

#include "lib/fxl/memory/ref_counted.h"

namespace blink {

class AssetProvider
: public fxl::RefCountedThreadSafe<AssetProvider>
{
public:
virtual bool GetAsBuffer(const std::string& asset_name,
std::vector<uint8_t>* data) = 0;
virtual ~AssetProvider() = default;
};

} // namespace blink
#endif // FLUTTER_ASSETS_ASSET_PROVIDER_H
32 changes: 0 additions & 32 deletions assets/asset_resolver.h

This file was deleted.

Loading