From 2db7369014649cc0cf30635db5af9c470d24b910 Mon Sep 17 00:00:00 2001
From: Lin Sun <lin.sun@intel.com>
Date: Tue, 31 Mar 2015 09:45:14 +0800
Subject: [PATCH] Support shared mode for crosswalk library

Shared mode allows multiple xwalk apps to share one xwalk runtime
library. Each xwalk app is bundled with a reflection layer instead
of the whole runtime library, whereas there is a library apk to be
installed on device for xwalk apps to use.
---
 .gitignore                                    |  1 +
 bin/templates/project/Activity.java           |  4 ++++
 bin/templates/project/AndroidManifest.xml     |  4 +++-
 .../org/apache/cordova/CordovaActivity.java   |  7 +++++-
 .../apache/cordova/CordovaApplication.java    | 24 +++++++++++++++++++
 .../apache/cordova/CordovaWebViewClient.java  |  1 -
 .../src/org/apache/cordova/DroidGap.java      |  3 +++
 7 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 framework/src/org/apache/cordova/CordovaApplication.java

diff --git a/.gitignore b/.gitignore
index f7416c82..12ab855f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@ framework/libs
 framework/javadoc-public
 framework/javadoc-private
 framework/xwalk_core_library
+framework/xwalk_shared_library
 test/libs
 example
 ./test
diff --git a/bin/templates/project/Activity.java b/bin/templates/project/Activity.java
index 55395197..b30ce61c 100644
--- a/bin/templates/project/Activity.java
+++ b/bin/templates/project/Activity.java
@@ -28,6 +28,10 @@ public class __ACTIVITY__ extends CordovaActivity
     public void onCreate(Bundle savedInstanceState)
     {
         super.onCreate(savedInstanceState);
+    }
+
+    @Override
+    protected void onXWalkReady() {
         super.init();
         // Set by <content src="index.html" /> in config.xml
         loadUrl(launchUrl);
diff --git a/bin/templates/project/AndroidManifest.xml b/bin/templates/project/AndroidManifest.xml
index 7317622d..9bb274d4 100644
--- a/bin/templates/project/AndroidManifest.xml
+++ b/bin/templates/project/AndroidManifest.xml
@@ -31,8 +31,10 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
-    <application android:icon="@drawable/icon" android:label="@string/app_name"
+    <application android:name="org.apache.cordova.CordovaApplication"
+        android:icon="@drawable/icon" android:label="@string/app_name"
         android:hardwareAccelerated="true">
         <activity android:name="__ACTIVITY__"
                 android:label="@string/activity_name"
diff --git a/framework/src/org/apache/cordova/CordovaActivity.java b/framework/src/org/apache/cordova/CordovaActivity.java
index 8bfb1f6a..9a0543d2 100755
--- a/framework/src/org/apache/cordova/CordovaActivity.java
+++ b/framework/src/org/apache/cordova/CordovaActivity.java
@@ -28,6 +28,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.apache.cordova.LOG;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.xwalk.core.XWalkActivity;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -78,6 +79,10 @@ Licensed to the Apache Software Foundation (ASF) under one
  *       &#64;Override
  *       public void onCreate(Bundle savedInstanceState) {
  *         super.onCreate(savedInstanceState);
+ *       }
+ *
+ *       &#64;Override
+ *       public void onXWalkReady() {
  *         super.init();
  *         // Load your application
  *         loadUrl(launchUrl);
@@ -92,7 +97,7 @@ Licensed to the Apache Software Foundation (ASF) under one
  * deprecated in favor of the config.xml file.
  *
  */
-public class CordovaActivity extends Activity implements CordovaInterface {
+public abstract class CordovaActivity extends XWalkActivity implements CordovaInterface {
     public static String TAG = "CordovaActivity";
 
     // The webview for our app
diff --git a/framework/src/org/apache/cordova/CordovaApplication.java b/framework/src/org/apache/cordova/CordovaApplication.java
new file mode 100644
index 00000000..821c1925
--- /dev/null
+++ b/framework/src/org/apache/cordova/CordovaApplication.java
@@ -0,0 +1,24 @@
+/*
+       Licensed to the Apache Software Foundation (ASF) under one
+       or more contributor license agreements.  See the NOTICE file
+       distributed with this work for additional information
+       regarding copyright ownership.  The ASF licenses this file
+       to you under the Apache License, Version 2.0 (the
+       "License"); you may not use this file except in compliance
+       with the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing,
+       software distributed under the License is distributed on an
+       "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
+package org.apache.cordova;
+
+import org.xwalk.core.XWalkApplication;
+
+public class CordovaApplication extends XWalkApplication {
+}
diff --git a/framework/src/org/apache/cordova/CordovaWebViewClient.java b/framework/src/org/apache/cordova/CordovaWebViewClient.java
index 438dab8b..3621fade 100755
--- a/framework/src/org/apache/cordova/CordovaWebViewClient.java
+++ b/framework/src/org/apache/cordova/CordovaWebViewClient.java
@@ -39,7 +39,6 @@ Licensed to the Apache Software Foundation (ASF) under one
 import android.webkit.ValueCallback;
 //import android.webkit.WebView;
 //import android.webkit.WebViewClient;
-import org.chromium.net.NetError;
 import org.xwalk.core.XWalkResourceClient;
 import org.xwalk.core.XWalkView;
 
diff --git a/framework/src/org/apache/cordova/DroidGap.java b/framework/src/org/apache/cordova/DroidGap.java
index d72d2a45..b1d6f0ac 100644
--- a/framework/src/org/apache/cordova/DroidGap.java
+++ b/framework/src/org/apache/cordova/DroidGap.java
@@ -30,5 +30,8 @@ Licensed to the Apache Software Foundation (ASF) under one
  */
 @Deprecated
 public class DroidGap extends CordovaActivity {
+    @Override
+    protected void onXWalkReady() {
+    }
 
 }