From e8db5dfd52ee68ae2f60959ad5e6571856480844 Mon Sep 17 00:00:00 2001 From: Jason Simmons Date: Thu, 30 May 2019 16:50:31 -0700 Subject: [PATCH] Always run the resource extractor in FlutterMain (#9149) FlutterMain.findAppBundlePath is using the presence of the flutter_assets directory as a signal that the app is initialized. For consistency, FlutterMain will run the resource extractor at startup and create flutter_assets even if no resources need to be extracted. --- .../android/io/flutter/view/FlutterMain.java | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/shell/platform/android/io/flutter/view/FlutterMain.java b/shell/platform/android/io/flutter/view/FlutterMain.java index d9cf1adb2..57f32ba9a 100644 --- a/shell/platform/android/io/flutter/view/FlutterMain.java +++ b/shell/platform/android/io/flutter/view/FlutterMain.java @@ -188,11 +188,7 @@ public class FlutterMain { return; } try { - // There are resources to extract. For example, the AOT blobs from the `assets` directory. - // `sResourceExtractor` is `null` if there isn't any AOT blob to extract. - if (sResourceExtractor != null) { - sResourceExtractor.waitForCompletion(); - } + sResourceExtractor.waitForCompletion(); List shellArgs = new ArrayList<>(); shellArgs.add("--icu-symbol-prefix=_binary_icudtl_dat"); @@ -313,13 +309,6 @@ public class FlutterMain { * This is required by the Dart runtime, so it can read the blobs. */ private static void initResources(@NonNull Context applicationContext) { - // When the AOT blobs are contained in the native library directory, - // we don't need to extract them manually because they are - // extracted by the Android Package Manager automatically. - if (!sSnapshotPath.equals(PathUtils.getDataDirectory(applicationContext))) { - return; - } - new ResourceCleaner(applicationContext).start(); final String dataDirPath = PathUtils.getDataDirectory(applicationContext); -- GitLab