Switch to override splitcompat

Author: GaryQian

runtime/runtime_controller.h

@@ -501,8 +501,8 @@ class RuntimeController : public PlatformConfigurationClient {
   std::pair<bool, uint32_t> root_isolate_return_code_ = {false, 0};
   const fml::closure isolate_create_callback_;
   const fml::closure isolate_shutdown_callback_;
-  fml::WeakPtrFactory<RuntimeController> weak_factory_;
   std::shared_ptr<const fml::Mapping> persistent_isolate_data_;
+  fml::WeakPtrFactory<RuntimeController> weak_factory_;
 
   PlatformConfiguration* GetPlatformConfigurationIfAvailable();
 

shell/platform/android/io/flutter/app/FlutterApplication.java

@@ -5,9 +5,10 @@
 package io.flutter.app;
 
 import android.app.Activity;
+import android.content.Context;
 import android.app.Application;
 import androidx.annotation.CallSuper;
-import com.google.android.play.core.splitcompat.SplitCompatApplication;
+import com.google.android.play.core.splitcompat.SplitCompat;
 import io.flutter.FlutterInjector;
 
 /**
@@ -17,7 +18,7 @@
  * <p>Using this {@link android.app.Application} is not required when using APIs in the package
  * {@code io.flutter.embedding.android} since they self-initialize on first use.
  */
-public class FlutterApplication extends SplitCompatApplication {
+public class FlutterApplication extends Application {
   @Override
   @CallSuper
   public void onCreate() {
@@ -34,4 +35,12 @@ public Activity getCurrentActivity() {
   public void setCurrentActivity(Activity mCurrentActivity) {
     this.mCurrentActivity = mCurrentActivity;
   }
+
+  // This override allows split dynamic feature modules to work.
+  @Override
+  protected void attachBaseContext(Context base) {
+    super.attachBaseContext(base);
+    // Emulates installation of future on demand modules using SplitCompat.
+    SplitCompat.install(this);
+  }
 }