One direction works

Author: GaryQian

shell/common/platform_view.cc

@@ -157,4 +157,9 @@ Dart_Handle PlatformView::OnDartLoadLibrary(intptr_t loading_unit_id) {
   return Dart_Null();
 }
 
+Dart_Handle PlatformView::CompleteDartLoadLibrary(intptr_t loading_unit_id,
+                                                  std::string lib_name) {
+  return Dart_Null();
+}
+
 }  // namespace flutter

shell/common/platform_view.h

@@ -586,6 +586,9 @@ class PlatformView {
 
   virtual Dart_Handle OnDartLoadLibrary(intptr_t loading_unit_id);
 
+  virtual Dart_Handle CompleteDartLoadLibrary(intptr_t loading_unit_id,
+                                              std::string lib_name);
+
  protected:
   PlatformView::Delegate& delegate_;
   const TaskRunners task_runners_;

shell/platform/android/io/flutter/embedding/engine/FlutterJNI.java

@@ -972,19 +972,26 @@ public void downloadDynamicFeature(int loadingUnitId) {
   // This should be called for every loading unit to be loaded into the dart isolate.
   @UiThread
   public void loadDartLibrary(
-      @NonNull String bundlePath,
+      int loadingUnitId,
+      @NonNull String libPath,
+      @NonNull String libName,
       @NonNull AssetManager assetManager) {
     ensureRunningOnMainThread();
     ensureAttachedToNative();
     nativeLoadDartLibrary(
         nativePlatformViewId,
-        bundlePath,
+        loadingUnitId,
+        libPath,
+        libName,
         assetManager);
+    Log.e("flutter", "loadDartLibrary FlutterJNI");
   }
   private native void nativeLoadDartLibrary(
       long nativePlatformViewId,
-      @NonNull String bundlePath,
-      @NonNull AssetManager manager);
+      int loadingUnitId,
+      @NonNull String libPath,
+      @NonNull String libName,
+      @NonNull AssetManager assetManager);
   // @SuppressWarnings("unused")
   // @UiThread
   // public void loadDartLibrary(@NonNull String libPath) {

shell/platform/android/io/flutter/embedding/engine/dynamicfeatures/PlayStoreDynamicFeatureManager.java

@@ -28,7 +28,6 @@
 import com.google.android.play.core.splitinstall.model.SplitInstallErrorCode;
 import com.google.android.play.core.splitinstall.model.SplitInstallSessionStatus;
 import io.flutter.embedding.engine.FlutterJNI;
-import io.flutter.embedding.engine.loader.FlutterApplicationInfo;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -58,9 +57,9 @@ public void onStateUpdate(SplitInstallSessionState state) {
           }
           case SplitInstallSessionStatus.INSTALLED: {
             Log.e("flutter", "Module \"" + sessionIdToName.get(state.sessionId()) + "\" (sessionId " + state.sessionId() + ") installed successfully.");
+            extractModule(sessionIdToName.get(state.sessionId()), sessionIdToLoadingUnitId.get(state.sessionId()));
             sessionIdToName.remove(state.sessionId());
             sessionIdToLoadingUnitId.remove(state.sessionId());
-            extractModule(sessionIdToName.get(state.sessionId()), sessionIdToLoadingUnitId.get(state.sessionId()));
             break;
           }
           case SplitInstallSessionStatus.CANCELED: {
@@ -105,10 +104,16 @@ public PlayStoreDynamicFeatureManager(Context context, FlutterJNI flutterJNI) {
     listener = new FeatureInstallStateUpdatedListener();
     splitInstallManager.registerListener(listener);
     sessionIdToName = new HashMap();
+    sessionIdToLoadingUnitId = new HashMap();
   }
 
   public void downloadModule(@NonNull String moduleName, int loadingUnitId) {
     Log.e("flutter", "INSTALLING MODULE " + moduleName);
+    if (splitInstallManager.getInstalledModules().contains(moduleName)) {
+      loadDartModules(moduleName, loadingUnitId);
+      return;
+    }
+
     SplitInstallRequest request =
         SplitInstallRequest
             .newBuilder()
@@ -152,7 +157,6 @@ public void extractModule(@NonNull String moduleName, int loadingUnitId) {
 
     try {
       context = context.createPackageContext(context.getPackageName(), 0);
-      AssetManager am = context.getAssets();
       // We only load dart shared lib for the loading unit id requested. Other loading units in the
       // dynamic feature module are not loaded, but can be loaded by calling again with their loading
       // unit id.
@@ -173,16 +177,28 @@ public void loadDartModules(@NonNull String moduleName, int loadingUnitId) {
     if (android.os.Build.VERSION.SDK_INT >= 23) {
       clearTextPermitted = NetworkSecurityPolicy.getInstance().isCleartextTrafficPermitted();
     }
-    FlutterApplicationInfo flutterApplicationInfo = new FlutterApplicationInfo(
-        "app.so-" + loadingUnitId + ".part.so", // AOT_SHARED_LIBRARY_NAME
-        null, // VM_SNAPSHOT_DATA_KEY
-        null, // ISOLATE_SNAPSHOT_DATA_KEY
-        null, // FLUTTER_ASSETS_DIR_KEY
-        null, // Network policy
-        appInfo.nativeLibraryDir,
-        clearTextPermitted);
+
+    String aotSharedLibraryName = "app.so-" + loadingUnitId + ".part.so";
+    String nativeLibraryDir = appInfo.nativeLibraryDir;
+    // FlutterApplicationInfo flutterApplicationInfo = new FlutterApplicationInfo(
+    //     "app.so-" + loadingUnitId + ".part.so", // AOT_SHARED_LIBRARY_NAME
+    //     null, // VM_SNAPSHOT_DATA_KEY
+    //     null, // ISOLATE_SNAPSHOT_DATA_KEY
+    //     null, // FLUTTER_ASSETS_DIR_KEY
+    //     null, // Network policy
+    //     appInfo.nativeLibraryDir,
+    //     clearTextPermitted);
+  // final String aotSharedLibraryName;
+  // final String vmSnapshotData;
+  // final String isolateSnapshotData;
+  // final String flutterAssetsDir;
+  // final String domainNetworkPolicy;
+  // final String nativeLibraryDir;
+  // final boolean clearTextPermitted;
+    AssetManager assetManager = context.getAssets();
 
     // find one or more .so file and initiate callbacks from https://github.com/flutter/flutter/issues/62229
+    flutterJNI.loadDartLibrary(loadingUnitId, nativeLibraryDir, aotSharedLibraryName, assetManager);
   }
 
   @NonNull

shell/platform/android/jni/platform_view_android_jni.h

@@ -11,7 +11,6 @@
 #include "flutter/flow/embedded_views.h"
 #include "flutter/lib/ui/window/platform_message.h"
 #include "flutter/shell/platform/android/surface/android_native_window.h"
-#include "third_party/dart/runtime/include/dart_api.h"
 #include "third_party/skia/include/core/SkMatrix.h"
 
 #if OS_ANDROID
@@ -197,8 +196,7 @@ class PlatformViewAndroidJNI {
 
   virtual double GetDisplayRefreshRate() = 0;
 
-  virtual Dart_Handle FlutterViewDownloadDynamicFeature(
-      int loading_unit_id) = 0;
+  virtual bool FlutterViewDownloadDynamicFeature(int loading_unit_id) = 0;
 };
 
 }  // namespace flutter

shell/platform/android/platform_view_android.cc

@@ -7,8 +7,10 @@
 #include <memory>
 #include <utility>
 
+#include "flutter/fml/command_line.h"
 #include "flutter/fml/synchronization/waitable_event.h"
 #include "flutter/shell/common/shell_io_manager.h"
+#include "flutter/shell/common/switches.h"
 #include "flutter/shell/gpu/gpu_surface_gl_delegate.h"
 #include "flutter/shell/platform/android/android_context_gl.h"
 #include "flutter/shell/platform/android/android_external_texture_gl.h"
@@ -323,7 +325,48 @@ PlatformViewAndroid::ComputePlatformResolvedLocales(
 
 // |PlatformView|
 Dart_Handle PlatformViewAndroid::OnDartLoadLibrary(intptr_t loading_unit_id) {
-  return jni_facade_->FlutterViewDownloadDynamicFeature(loading_unit_id);
+  if (jni_facade_->FlutterViewDownloadDynamicFeature(loading_unit_id)) {
+    return Dart_Null();
+  }
+  return Dart_Null();  // TODO: RETURN ERROR
+}
+
+// |PlatformView|
+Dart_Handle PlatformViewAndroid::CompleteDartLoadLibrary(
+    intptr_t loading_unit_id,
+    std::string lib_name) {
+  std::vector<std::string> args;
+  args.push_back("flutter");
+  args.push_back("--aot-shared-library-name=" + lib_name);
+  // args.push_back("--" + "aot-shared-library-name" + "=" +
+  //                fml::jni::JavaStringToString(env, jLibPath));
+  //   shellArgs.add(
+  //     "--" + AOT_SHARED_LIBRARY_NAME + "=" +
+  //     flutterApplicationInfo.aotSharedLibraryName);
+
+  // // Most devices can load the AOT shared library based on the library name
+  // // with no directory path.  Provide a fully qualified path to the library
+  // // as a workaround for devices where that fails.
+  // shellArgs.add(
+  //     "--"
+  //         + AOT_SHARED_LIBRARY_NAME
+  //         + "="
+  //         + flutterApplicationInfo.nativeLibraryDir
+  //         + File.separator
+  //         + flutterApplicationInfo.aotSharedLibraryName);
+  auto command_line = fml::CommandLineFromIterators(args.begin(), args.end());
+
+  auto settings = SettingsFromCommandLine(command_line);
+
+  fml::RefPtr<DartSnapshot> isolateSnapshot =
+      DartSnapshot::IsolateSnapshotFromSettings(settings);
+
+  // ANDROID_SHELL_HOLDER->Launch(std::move(config));
+
+  Dart_Handle result = Dart_DeferredLoadComplete(
+      loading_unit_id, isolateSnapshot->GetDataMapping(),
+      isolateSnapshot->GetInstructionsMapping());
+  return result;
 }
 
 void PlatformViewAndroid::InstallFirstFrameCallback() {

shell/platform/android/platform_view_android.h

@@ -78,6 +78,10 @@ class PlatformViewAndroid final : public PlatformView {
       int64_t texture_id,
       const fml::jni::JavaObjectWeakGlobalRef& surface_texture);
 
+  // |PlatformView|
+  Dart_Handle CompleteDartLoadLibrary(intptr_t loading_unit_id,
+                                      std::string lib_name) override;
+
  private:
   const std::shared_ptr<PlatformViewAndroidJNI> jni_facade_;
 

shell/platform/android/platform_view_android_jni_impl.cc

@@ -13,14 +13,17 @@
 
 #include "flutter/assets/directory_asset_bundle.h"
 #include "flutter/common/settings.h"
+#include "flutter/fml/command_line.h"
 #include "flutter/fml/file.h"
 #include "flutter/fml/platform/android/jni_util.h"
 #include "flutter/fml/platform/android/jni_weak_ref.h"
 #include "flutter/fml/platform/android/scoped_java_ref.h"
 #include "flutter/fml/size.h"
 #include "flutter/lib/ui/plugins/callback_cache.h"
 #include "flutter/runtime/dart_service_isolate.h"
+#include "flutter/runtime/dart_snapshot.h"
 #include "flutter/shell/common/run_configuration.h"
+#include "flutter/shell/common/switches.h"
 #include "flutter/shell/platform/android/android_external_texture_gl.h"
 #include "flutter/shell/platform/android/android_shell_holder.h"
 #include "flutter/shell/platform/android/apk_asset_provider.h"
@@ -514,48 +517,46 @@ static jboolean FlutterTextUtilsIsRegionalIndicator(JNIEnv* env,
 static void LoadDartLibrary(JNIEnv* env,
                             jobject obj,
                             jlong shell_holder,
-                            jstring jLibPath,
+                            jint jLoadingUnitId,
+                            jstring jAssetPath,
+                            jstring jLibName,
                             jobject jAssetManager) {
+  FML_LOG(ERROR) << "LoadDartLibrary Native";
   // see RunBundleAndSnapshotFromLibrary above for dart loading code
   auto asset_manager = std::make_shared<flutter::AssetManager>();
 
   asset_manager->PushBack(std::make_unique<flutter::APKAssetProvider>(
-      env,                                          // jni environment
-      jAssetManager,                                // asset manager
-      fml::jni::JavaStringToString(env, jLibPath))  // apk asset dir
+      env,                                            // jni environment
+      jAssetManager,                                  // asset manager
+      fml::jni::JavaStringToString(env, jAssetPath))  // apk asset dir
   );
 
-  std::unique_ptr<IsolateConfiguration> isolate_configuration;
-  if (flutter::DartVM::IsRunningPrecompiledCode()) {
-    isolate_configuration = IsolateConfiguration::CreateForAppSnapshot();
-  } else {
-    std::unique_ptr<fml::Mapping> kernel_blob =
-        fml::FileMapping::CreateReadOnly(
-            ANDROID_SHELL_HOLDER->GetSettings().application_kernel_asset);
-    if (!kernel_blob) {
-      FML_DLOG(ERROR) << "Unable to load the kernel blob asset.";
-      return;
-    }
-    isolate_configuration =
-        IsolateConfiguration::CreateForKernel(std::move(kernel_blob));
-  }
-
-  RunConfiguration config(std::move(isolate_configuration),
-                          std::move(asset_manager));
+  // std::unique_ptr<IsolateConfiguration> isolate_configuration;
+  // if (flutter::DartVM::IsRunningPrecompiledCode()) {
+  //   isolate_configuration = IsolateConfiguration::CreateForAppSnapshot();
+  // } else {
+  //   std::unique_ptr<fml::Mapping> kernel_blob =
+  //       fml::FileMapping::CreateReadOnly(
+  //           ANDROID_SHELL_HOLDER->GetSettings().application_kernel_asset);
+  //   if (!kernel_blob) {
+  //     FML_DLOG(ERROR) << "Unable to load the kernel blob asset.";
+  //     return;
+  //   }
+  //   isolate_configuration =
+  //       IsolateConfiguration::CreateForKernel(std::move(kernel_blob));
+  // }
 
-  // {
-  //   auto entrypoint = fml::jni::JavaStringToString(env, jEntrypoint);
-  //   auto libraryUrl = fml::jni::JavaStringToString(env, jLibraryUrl);
+  // RunConfiguration config(std::move(isolate_configuration),
+  //                         std::move(asset_manager));
 
-  //   if ((entrypoint.size() > 0) && (libraryUrl.size() > 0)) {
-  //     config.SetEntrypointAndLibrary(std::move(entrypoint),
-  //                                    std::move(libraryUrl));
-  //   } else if (entrypoint.size() > 0) {
-  //     config.SetEntrypoint(std::move(entrypoint));
-  //   }
+  ANDROID_SHELL_HOLDER->GetPlatformView()->CompleteDartLoadLibrary(
+      static_cast<intptr_t>(jLoadingUnitId),
+      fml::jni::JavaStringToString(env, jLibName));
+  FML_LOG(ERROR) << "LoadDartLibrary Native Finished";
+  // if (Dart_IsError(result)) {
+  //   return;
   // }
 
-  ANDROID_SHELL_HOLDER->Launch(std::move(config));
   // ANDROID_SHELL_HOLDER->DynamicFeatureInstallSuccess();
 }
 
@@ -730,7 +731,8 @@ bool RegisterApi(JNIEnv* env) {
       {
           .name = "nativeLoadDartLibrary",
           .signature =
-              "(JLjava/lang/String;Landroid/content/res/AssetManager;)V",
+              "(JILjava/lang/String;Ljava/lang/String;Landroid/content/"
+              "res/AssetManager;)V",
           .fnPtr = reinterpret_cast<void*>(&LoadDartLibrary),
       },
       {
@@ -1420,20 +1422,20 @@ double PlatformViewAndroidJNIImpl::GetDisplayRefreshRate() {
   return static_cast<double>(env->GetStaticFloatField(clazz, fid));
 }
 
-Dart_Handle PlatformViewAndroidJNIImpl::FlutterViewDownloadDynamicFeature(
+bool PlatformViewAndroidJNIImpl::FlutterViewDownloadDynamicFeature(
     int loading_unit_id) {
   JNIEnv* env = fml::jni::AttachCurrentThread();
 
   auto java_object = java_object_.get(env);
   if (java_object.is_null()) {
-    return Dart_Null();
+    return true;
   }
 
   env->CallObjectMethod(java_object.obj(), g_download_dynamic_feature_method,
                         loading_unit_id);
 
   FML_CHECK(CheckException(env));
-  return Dart_Null();
+  return true;
 }
 
 }  // namespace flutter

shell/platform/android/platform_view_android_jni_impl.h

@@ -80,7 +80,7 @@ class PlatformViewAndroidJNIImpl final : public PlatformViewAndroidJNI {
 
   double GetDisplayRefreshRate() override;
 
-  Dart_Handle FlutterViewDownloadDynamicFeature(int loading_unit_id) override;
+  bool FlutterViewDownloadDynamicFeature(int loading_unit_id) override;
 
  private:
   // Reference to FlutterJNI object.