Remove support for reading FLX archives from engine. (flutter#5305)

The embedders have moved on already. This also removes a //garnet dependency on zlib wrappers.
TheDauntless · May 18, 2018 · 299a7c2 · 299a7c2
1 parent 34ffb6a
commit 299a7c2
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 189 deletions.
diff --git a/assets/BUILD.gn b/assets/BUILD.gn
@@ -9,20 +9,13 @@ source_set("assets") {
     "asset_resolver.h",
     "directory_asset_bundle.cc",
     "directory_asset_bundle.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",
-  ]
-
-  public_deps = [
-    "//third_party/zlib:minizip",
   ]
 
   public_configs = [ "$flutter_root:config" ]

diff --git a/assets/asset_manager.cc b/assets/asset_manager.cc
@@ -5,7 +5,6 @@
 #include "flutter/assets/asset_manager.h"
 
 #include "flutter/assets/directory_asset_bundle.h"
-#include "flutter/assets/zip_asset_store.h"
 #include "flutter/glue/trace_event.h"
 #include "lib/fxl/files/path.h"
 

diff --git a/assets/zip_asset_store.cc b/assets/zip_asset_store.cc
diff --git a/assets/zip_asset_store.h b/assets/zip_asset_store.h
diff --git a/shell/common/run_configuration.cc b/shell/common/run_configuration.cc
@@ -7,7 +7,6 @@
 #include <sstream>
 
 #include "flutter/assets/directory_asset_bundle.h"
-#include "flutter/assets/zip_asset_store.h"
 #include "flutter/fml/file.h"
 #include "flutter/runtime/dart_vm.h"
 
@@ -24,9 +23,6 @@ RunConfiguration RunConfiguration::InferFromSettings(
       std::make_unique<blink::DirectoryAssetBundle>(fml::OpenFile(
           settings.assets_path.c_str(), fml::OpenPermission::kRead, true)));
 
-  asset_manager->PushBack(
-      std::make_unique<blink::ZipAssetStore>(settings.flx_path));
-
   return {IsolateConfiguration::InferFromSettings(settings, asset_manager),
           asset_manager};
 }

diff --git a/travis/licenses_golden/licenses_flutter b/travis/licenses_golden/licenses_flutter
@@ -322,8 +322,6 @@ ORIGIN: ../../../flutter/assets/directory_asset_bundle.cc + ../../../LICENSE
 TYPE: LicenseType.bsd
 FILE: ../../../flutter/assets/directory_asset_bundle.cc
 FILE: ../../../flutter/assets/directory_asset_bundle.h
-FILE: ../../../flutter/assets/zip_asset_store.cc
-FILE: ../../../flutter/assets/zip_asset_store.h
 FILE: ../../../flutter/common/settings.cc
 FILE: ../../../flutter/common/settings.h
 FILE: ../../../flutter/flow/export_node.cc