Remove libsky_shell.so to libflutter.so. (flutter/engine#3517)

This commit is contained in:
Chinmay Garde
2017-03-24 16:25:33 -07:00
committed by GitHub
parent 9ae8bb8f70
commit 7beff03713
3 changed files with 5 additions and 6 deletions

View File

@@ -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",
]

View File

@@ -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) {

View File

@@ -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<String> SKY_RESOURCES = ImmutableSetBuilder.<String>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