From 5e9873230111aa8c2d6806668a2e0484e21c6865 Mon Sep 17 00:00:00 2001 From: Chinmay Garde Date: Fri, 24 Mar 2017 16:25:33 -0700 Subject: [PATCH] Remove libsky_shell.so to libflutter.so. (#3517) --- shell/platform/android/BUILD.gn | 6 +++--- shell/platform/android/io/flutter/util/PathUtils.java | 2 +- shell/platform/android/io/flutter/view/FlutterMain.java | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/shell/platform/android/BUILD.gn b/shell/platform/android/BUILD.gn index 8264567d9..c061ff633 100644 --- a/shell/platform/android/BUILD.gn +++ b/shell/platform/android/BUILD.gn @@ -9,7 +9,7 @@ import("//build/config/android/rules.gni") shared_library("flutter_shell_native") { visibility = [ ":*" ] - output_name = "sky_shell" + output_name = "flutter" sources = [ "android_context_gl.cc", @@ -123,7 +123,7 @@ action("android") { inputs = [ "$root_build_dir/flutter_java.jar", - "$root_build_dir/libsky_shell.so", + "$root_build_dir/libflutter.so", "$root_build_dir/flutter_shell_assets/icudtl.dat", ] @@ -139,7 +139,7 @@ action("android") { "--asset_dir", rebase_path("flutter_shell_assets", root_build_dir, root_build_dir), "--native_lib", - rebase_path("libsky_shell.so", root_build_dir, root_build_dir), + rebase_path("libflutter.so", root_build_dir, root_build_dir), "--android_abi", "$android_app_abi", ] diff --git a/shell/platform/android/io/flutter/util/PathUtils.java b/shell/platform/android/io/flutter/util/PathUtils.java index 5d6707319..93ba68497 100644 --- a/shell/platform/android/io/flutter/util/PathUtils.java +++ b/shell/platform/android/io/flutter/util/PathUtils.java @@ -10,7 +10,7 @@ import java.lang.String; public final class PathUtils { public static String getDataDirectory(Context applicationContext) { - return applicationContext.getDir("sky_shell", Context.MODE_PRIVATE).getPath(); + return applicationContext.getDir("flutter", Context.MODE_PRIVATE).getPath(); } public static String getCacheDirectory(Context applicationContext) { diff --git a/shell/platform/android/io/flutter/view/FlutterMain.java b/shell/platform/android/io/flutter/view/FlutterMain.java index b3b4315ea..abe5794e8 100644 --- a/shell/platform/android/io/flutter/view/FlutterMain.java +++ b/shell/platform/android/io/flutter/view/FlutterMain.java @@ -57,7 +57,6 @@ public class FlutterMain { private static final String DEFAULT_FLX = "app.flx"; private static final String MANIFEST = "flutter.yaml"; - private static final String PRIVATE_DATA_DIRECTORY_SUFFIX = "sky_shell"; private static final Set SKY_RESOURCES = ImmutableSetBuilder.newInstance() .add("icudtl.dat") @@ -138,7 +137,7 @@ public class FlutterMain { long initStartTimestampMillis = SystemClock.uptimeMillis(); initConfig(applicationContext); initResources(applicationContext); - System.loadLibrary("sky_shell"); + System.loadLibrary("flutter"); initAot(applicationContext); // We record the initialization time using SystemClock because at the start of the -- GitLab