diff --git a/common/settings.h b/common/settings.h index 1805e363f7f22..317884c1757de 100644 --- a/common/settings.h +++ b/common/settings.h @@ -144,7 +144,6 @@ struct Settings { fml::UniqueFD::element_type assets_dir = fml::UniqueFD::traits_type::InvalidValue(); std::string assets_path; - std::string flx_path; }; } // namespace flutter diff --git a/shell/common/switches.cc b/shell/common/switches.cc index 4d4ed1b86b628..859a798c0fc25 100644 --- a/shell/common/switches.cc +++ b/shell/common/switches.cc @@ -198,8 +198,6 @@ Settings SettingsFromCommandLine(const fml::CommandLine& command_line) { settings.verbose_logging = command_line.HasOption(FlagForSwitch(Switch::VerboseLogging)); - command_line.GetOptionValue(FlagForSwitch(Switch::FLX), &settings.flx_path); - command_line.GetOptionValue(FlagForSwitch(Switch::FlutterAssetsDir), &settings.assets_path); diff --git a/shell/common/switches.h b/shell/common/switches.h index 7747c33bca44c..73c00d97a0953 100644 --- a/shell/common/switches.h +++ b/shell/common/switches.h @@ -90,7 +90,6 @@ DEF_SWITCH(SkiaDeterministicRendering, "Skips the call to SkGraphics::Init(), thus avoiding swapping out" "some Skia function pointers based on available CPU features. This" "is used to obtain 100% deterministic behavior in Skia rendering.") -DEF_SWITCH(FLX, "flx", "Specify the FLX path.") DEF_SWITCH(FlutterAssetsDir, "flutter-assets-dir", "Path to the Flutter assets directory.") diff --git a/shell/platform/android/io/flutter/view/FlutterMain.java b/shell/platform/android/io/flutter/view/FlutterMain.java index 14b932061877e..685e6702b00c1 100644 --- a/shell/platform/android/io/flutter/view/FlutterMain.java +++ b/shell/platform/android/io/flutter/view/FlutterMain.java @@ -35,7 +35,6 @@ public class FlutterMain { private static final String AOT_VM_SNAPSHOT_INSTR_KEY = "vm-snapshot-instr"; private static final String AOT_ISOLATE_SNAPSHOT_DATA_KEY = "isolate-snapshot-data"; private static final String AOT_ISOLATE_SNAPSHOT_INSTR_KEY = "isolate-snapshot-instr"; - private static final String FLX_KEY = "flx"; private static final String FLUTTER_ASSETS_DIR_KEY = "flutter-assets-dir"; // XML Attribute keys supported in AndroidManifest.xml @@ -49,8 +48,6 @@ public class FlutterMain { FlutterMain.class.getName() + '.' + AOT_ISOLATE_SNAPSHOT_DATA_KEY; public static final String PUBLIC_AOT_ISOLATE_SNAPSHOT_INSTR_KEY = FlutterMain.class.getName() + '.' + AOT_ISOLATE_SNAPSHOT_INSTR_KEY; - public static final String PUBLIC_FLX_KEY = - FlutterMain.class.getName() + '.' + FLX_KEY; public static final String PUBLIC_FLUTTER_ASSETS_DIR_KEY = FlutterMain.class.getName() + '.' + FLUTTER_ASSETS_DIR_KEY; @@ -60,7 +57,6 @@ public class FlutterMain { private static final String DEFAULT_AOT_VM_SNAPSHOT_INSTR = "vm_snapshot_instr"; private static final String DEFAULT_AOT_ISOLATE_SNAPSHOT_DATA = "isolate_snapshot_data"; private static final String DEFAULT_AOT_ISOLATE_SNAPSHOT_INSTR = "isolate_snapshot_instr"; - private static final String DEFAULT_FLX = "app.flx"; private static final String DEFAULT_LIBRARY = "libflutter.so"; private static final String DEFAULT_KERNEL_BLOB = "kernel_blob.bin"; private static final String DEFAULT_FLUTTER_ASSETS_DIR = "flutter_assets"; @@ -75,7 +71,6 @@ private static String fromFlutterAssets(String filePath) { private static String sAotVmSnapshotInstr = DEFAULT_AOT_VM_SNAPSHOT_INSTR; private static String sAotIsolateSnapshotData = DEFAULT_AOT_ISOLATE_SNAPSHOT_DATA; private static String sAotIsolateSnapshotInstr = DEFAULT_AOT_ISOLATE_SNAPSHOT_INSTR; - private static String sFlx = DEFAULT_FLX; private static String sFlutterAssetsDir = DEFAULT_FLUTTER_ASSETS_DIR; private static boolean sInitialized = false; @@ -295,7 +290,6 @@ private static void initConfig(Context applicationContext) { sAotVmSnapshotInstr = metadata.getString(PUBLIC_AOT_VM_SNAPSHOT_INSTR_KEY, DEFAULT_AOT_VM_SNAPSHOT_INSTR); sAotIsolateSnapshotData = metadata.getString(PUBLIC_AOT_ISOLATE_SNAPSHOT_DATA_KEY, DEFAULT_AOT_ISOLATE_SNAPSHOT_DATA); sAotIsolateSnapshotInstr = metadata.getString(PUBLIC_AOT_ISOLATE_SNAPSHOT_INSTR_KEY, DEFAULT_AOT_ISOLATE_SNAPSHOT_INSTR); - sFlx = metadata.getString(PUBLIC_FLX_KEY, DEFAULT_FLX); sFlutterAssetsDir = metadata.getString(PUBLIC_FLUTTER_ASSETS_DIR_KEY, DEFAULT_FLUTTER_ASSETS_DIR); } } catch (PackageManager.NameNotFoundException e) { @@ -334,7 +328,6 @@ private static void initResources(Context applicationContext) { sResourceExtractor = new ResourceExtractor(context); sResourceExtractor - .addResource(fromFlutterAssets(sFlx)) .addResource(fromFlutterAssets(sAotVmSnapshotData)) .addResource(fromFlutterAssets(sAotVmSnapshotInstr)) .addResource(fromFlutterAssets(sAotIsolateSnapshotData))