Rebase Crosswalk to support Cordova 3.7.1

.gitignore

@@ -16,6 +16,8 @@ framework/assets/www/phonegap-*.js
 framework/libs
 framework/javadoc-public
 framework/javadoc-private
+framework/xwalk_core_library
+framework/xwalk_shared_library
 test/libs
 example
 ./test
@@ -40,3 +42,7 @@ Desktop.ini
 npm-debug.log
 /node_modules
 /framework/build
+# Eclipse files
+.classpath
+.project
+.settings

README.md

@@ -18,10 +18,12 @@
 # under the License.
 #
 -->
-Cordova Android
+Crosswalk-based Cordova Android
 ===
 
-Cordova Android is an Android application library that allows for Cordova-based
+Crosswalk-based Cordova Android is derived from [Cordova Android](https://github.com/apache/cordova-android) 
+and uses [Crosswalk](https://github.com/crosswalk-project/crosswalk) as the 
+HTML5 runtime. It is an Android application library that allows for Cordova-based
 projects to be built for the Android Platform. Cordova based applications are,
 at the core, applications written with web technology: HTML, CSS and JavaScript.
 
@@ -34,6 +36,18 @@ Requires
 - Java JDK 1.5 or greater
 - Apache Ant 1.8.0 or greater
 - Android SDK [http://developer.android.com](http://developer.android.com)
+- Python 2.6 or greater
+
+Setup Crosswalk Dependency
+---
+
+1. Please download the crosswalk-webview for Android package from [Crosswalk download site](https://download.01.org/crosswalk/releases/crosswalk/android/).
+2. Unzip the crosswalk-webview package to a folder and create a link named `xwalk_core_library` under `framework` linking to that folder.
+
+For example, on Linux:
+
+    $cd /path/to/crosswalk-cordova-android/framework
+    $ln -s /path/to/crosswalk-webview-unzipped-folder/ xwalk_core_library
 
 
 Cordova Android Developer Tools
@@ -57,27 +71,14 @@ These commands live in a generated Cordova Android project. Any interactions wit
     ./cordova/run   ........................ calls `build` then deploys to a connected Android device. If no Android device is detected, will launch an emulator and deploy to it.
     ./cordova/version ...................... returns the cordova-android version of the current project
 
-Importing a Cordova Android Project into Eclipse
+Importing a Crosswalk-based Cordova Android Project into Eclipse
 ----
 
-1. File > New > Project...
-2. Android > Android Project
-3. Create project from existing source (point to the generated app found in tmp/android)
-4. Right click on libs/cordova.jar and add to build path
-5. Right click on the project root: Run as > Run Configurations
-6. Click on the Target tab and select Manual (this way you can choose the emulator or device to build to)
-
-Building without the Tooling
----
-Note: The Developer Tools handle this.  This is only to be done if the tooling fails, or if
-you are developing directly against the framework.
-
-
-To create your `cordova.jar` file, run in the framework directory:
-
-    android update project -p . -t android-19
-    ant jar
-
+1. Import Crosswalk-based Cordova Android and XWalkCoreLibrary library projects by File > Import... > Existing Android Code Into Workspace. Point to `[path_to_cordova_xwalk_android]/framework` and click  `Finish`.
+2. Build `xwalk_core_library` and `Cordova` projects.
+3. Import generated project by File > Import... > Existing Android Code. Point to the generated app path.
+4. Right click on the project root: Run as > Run Configurations
+5. Click on the Target tab and select Manual (this way you can choose the emulator or device to build to)
 
 Running Tests
 ----

bin/create

@@ -21,6 +21,8 @@
 var path = require('path');
 var create = require('./lib/create');
 var args  = require('./lib/simpleargs').getArgs(process.argv);
+var apk_url = args['--xwalk-apk-url'];
+var shared_library = args['--xwalk-shared-library'];
 
 if (args['--help'] || args._.length === 0) {
     console.log('Usage: ' + path.relative(process.cwd(), path.join(__dirname, 'create')) + ' <path_to_new_project> <package_name> <project_name> [<template_path>] [--shared]');
@@ -29,8 +31,23 @@ if (args['--help'] || args._.length === 0) {
     console.log('    <project_name>: Project name');
     console.log('    <template_path>: Path to a custom application template to use');
     console.log('    --shared will use the CordovaLib project directly instead of making a copy.');
+    console.log('    --xwalk-shared-library will use Crosswalk shared mode to package the project that without xwalk so library.');
+    console.log('    --xwalk-apk-url configure the download URL of the Crosswalk runtime library, it requires --xwalk-shared-library.');
     process.exit(1);
 }
 
-create.createProject(args._[0], args._[1], args._[2], args._[3], args['--shared'], args['--cli']).done();
+if (typeof apk_url != 'undefined' &&
+        (typeof apk_url != 'string' || apk_url.length == 0)) {
+    console.log('    --xwalk-apk-url expects a URL.');
+    process.exit(1);
+}
+if (apk_url && !shared_library) {
+    console.log('    --xwalk-apk-url must be used together with --xwalk-shared-library.');
+    process.exit(1);
+}
+if (args['--shared'] && (apk_url || shared_library)) {
+    console.log('    --shared cannot be used with --xwalk-apk-url and --xwalk-shared-library.');
+    process.exit(1);
+}
 
+create.createProject(args._[0], args._[1], args._[2], args._[3], args['--shared'], args['--cli'], args['--xwalk-shared-library'], args['--xwalk-apk-url']).done();

bin/lib/create.js

@@ -24,7 +24,9 @@ var shell = require('shelljs'),
     path  = require('path'),
     fs    = require('fs'),
     check_reqs = require('./check_reqs'),
-    ROOT    = path.join(__dirname, '..', '..');
+    ROOT    = path.join(__dirname, '..', '..'),
+    XWALK_LIBRARY_PATH= path.join(ROOT, 'framework', 'xwalk_core_library');
+    XWALK_SHARED_LIBRARY_PATH= path.join(ROOT, 'framework', 'xwalk_shared_library');
 
 // Returns a promise.
 function exec(command, opt_cwd) {
@@ -50,7 +52,7 @@ function getFrameworkDir(projectPath, shared) {
     return shared ? path.join(ROOT, 'framework') : path.join(projectPath, 'CordovaLib');
 }
 
-function copyJsAndLibrary(projectPath, shared, projectName) {
+function copyJsAndLibrary(projectPath, shared, projectName, xwalkSharedLibrary) {
     var nestedCordovaLibPath = getFrameworkDir(projectPath, false);
     shell.cp('-f', path.join(ROOT, 'framework', 'assets', 'www', 'cordova.js'), path.join(projectPath, 'assets', 'www', 'cordova.js'));
     // Don't fail if there are no old jars.
@@ -74,6 +76,12 @@ function copyJsAndLibrary(projectPath, shared, projectName) {
         shell.cp('-f', path.join(ROOT, 'framework', 'build.gradle'), nestedCordovaLibPath);
         shell.cp('-f', path.join(ROOT, 'framework', 'cordova.gradle'), nestedCordovaLibPath);
         shell.cp('-r', path.join(ROOT, 'framework', 'src'), nestedCordovaLibPath);
+        if (xwalkSharedLibrary) {
+            shell.mkdir(path.join(nestedCordovaLibPath, 'xwalk_core_library'));
+            shell.cp('-r', path.join(ROOT, 'framework', 'xwalk_shared_library/*'), path.join(nestedCordovaLibPath, 'xwalk_core_library'));
+        } else {
+            shell.cp('-r', path.join(ROOT, 'framework', 'xwalk_core_library'), nestedCordovaLibPath);
+        }
         // Create an eclipse project file and set the name of it to something unique.
         // Without this, you can't import multiple CordovaLib projects into the same workspace.
         var eclipseProjectFilePath = path.join(nestedCordovaLibPath, '.project');
@@ -116,11 +124,14 @@ function writeProjectProperties(projectPath, target_api, shared) {
         data += 'android.library.reference.' + (i+1) + '=' + subProjects[i] + '\n';
     }
     fs.writeFileSync(dstPath, data);
+
+    var targetFrameworkDir = getFrameworkDir(projectPath, shared);
+    exec('android update lib-project -p "' + targetFrameworkDir + '" --target ' + target_api);
 }
 
 function copyBuildRules(projectPath) {
     var srcDir = path.join(ROOT, 'bin', 'templates', 'project');
-    shell.cp('-f', path.join(srcDir, 'custom_rules.xml'), projectPath);
+    //shell.cp('-f', path.join(srcDir, 'custom_rules.xml'), projectPath);
 
     shell.cp('-f', path.join(srcDir, 'build.gradle'), projectPath);
 }
@@ -198,7 +209,8 @@ function validateProjectName(project_name) {
  * Returns a promise.
  */
 
-exports.createProject = function(project_path, package_name, project_name, project_template_dir, use_shared_project, use_cli_template) {
+exports.createProject = function(project_path, package_name, project_name, project_template_dir,
+        use_shared_project, use_cli_template, xwalk_shared_library, xwalk_apk_url) {
     var VERSION = fs.readFileSync(path.join(ROOT, 'VERSION'), 'utf-8').trim();
 
     // Set default values for path, package and name
@@ -209,6 +221,7 @@ exports.createProject = function(project_path, package_name, project_name, proje
     project_template_dir = typeof project_template_dir !== 'undefined' ? 
                            project_template_dir : 
                            path.join(ROOT, 'bin', 'templates', 'project');
+    xwalk_apk_url = typeof xwalk_apk_url !== 'undefined' ? xwalk_apk_url : "";
 
     var package_as_path = package_name.replace(/\./g, path.sep);
     var activity_dir    = path.join(project_path, 'src', package_as_path);
@@ -224,6 +237,21 @@ exports.createProject = function(project_path, package_name, project_name, proje
         return Q.reject('Project already exists! Delete and recreate');
     }
 
+    // prepare xwalk_core_library
+    if(fs.existsSync(XWALK_LIBRARY_PATH)) {
+        exec('android update lib-project --path "' + XWALK_LIBRARY_PATH + '" --target "' + target_api + '"' )
+    } else {
+        // TODO(wang16): download xwalk core library here
+        return Q.reject('No XWalk Library Project found. Please download it and extract it to $XWALK_LIBRARY_PATH')
+    }
+    if (xwalk_shared_library) {
+        if (fs.existsSync(XWALK_SHARED_LIBRARY_PATH)) {
+            exec('android update lib-project --path "' + XWALK_SHARED_LIBRARY_PATH + '" --target "' + target_api + '"' )
+        } else {
+            return Q.reject('No XWalk Shared Library Project found. Please download it and extract it to $XWALK_SHARED_LIBRARY_PATH')
+        }
+    }
+
     //Make the package conform to Java package types
     return validatePackageName(package_name)
     .then(function() {
@@ -260,7 +288,7 @@ exports.createProject = function(project_path, package_name, project_name, proje
             }
 
             // copy cordova.js, cordova.jar
-            copyJsAndLibrary(project_path, use_shared_project, safe_activity_name);
+            copyJsAndLibrary(project_path, use_shared_project, safe_activity_name, xwalk_shared_library);
 
             // interpolate the activity name and package
             shell.mkdir('-p', activity_dir);
@@ -274,6 +302,7 @@ exports.createProject = function(project_path, package_name, project_name, proje
             shell.sed('-i', /__ACTIVITY__/, safe_activity_name, manifest_path);
             shell.sed('-i', /__PACKAGE__/, package_name, manifest_path);
             shell.sed('-i', /__APILEVEL__/, target_api.split('-')[1], manifest_path);
+            shell.sed('-i', /__XWALKAPKURL__/, xwalk_apk_url, manifest_path);
             copyScripts(project_path);
             copyBuildRules(project_path);
         });
@@ -301,13 +330,13 @@ function extractProjectNameFromManifest(projectPath) {
 }
 
 // Returns a promise.
-exports.updateProject = function(projectPath, shared) {
+exports.updateProject = function(projectPath, shared, xwalkSharedLibrary) {
     var newVersion = fs.readFileSync(path.join(ROOT, 'VERSION'), 'utf-8').trim();
     return Q()
     .then(function() {
         var projectName = extractProjectNameFromManifest(projectPath);
         var target_api = check_reqs.get_target();
-        copyJsAndLibrary(projectPath, shared, projectName);
+        copyJsAndLibrary(projectPath, shared, projectName, xwalkSharedLibrary);
         copyScripts(projectPath);
         copyBuildRules(projectPath);
         removeDebuggableFromManifest(projectPath);

bin/lib/simpleargs.js

@@ -22,7 +22,12 @@ exports.getArgs = function(argv) {
     var posArgs = [];
     for (var i = 2, arg; arg = argv[i] || i < argv.length; ++i) {
         if (/^--/.exec(arg)) {
-            ret[arg] = true;
+            if (arg.indexOf("=") != -1) {
+                var arr = arg.split("=");
+                ret[arr[0]] = arr[1];
+            } else {
+                ret[arg] = true;
+            }
         } else {
             posArgs.push(arg);
         }

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);

bin/templates/project/AndroidManifest.xml

@@ -28,10 +28,15 @@
         android:anyDensity="true"
         />
 
+    <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" android:supportsRtl="true">
+        <meta-data android:name="xwalk_apk_url" android:value="__XWALKAPKURL__" />
         <activity android:name="__ACTIVITY__"
                 android:label="@string/activity_name"
                 android:launchMode="singleTop"

bin/update

@@ -25,7 +25,13 @@ var args  = require('./lib/simpleargs').getArgs(process.argv);
 if (args['--help'] || args._.length === 0) {
     console.log('Usage: ' + path.relative(process.cwd(), path.join(__dirname, 'update')) + ' <path_to_project> [--shared]');
     console.log('    --shared will use the CordovaLib project directly instead of making a copy.');
+    console.log('    --xwalk-shared-library will use Crosswalk shared mode to package the project that without xwalk so library.');
     process.exit(1);
 }
-create.updateProject(args._[0], args['--shared']).done();
+if (args['--shared'] && args['--xwalk-shared-library']) {
+    console.log('    --xwalk-shared-library do not support --shared.');
+    process.exit(1);
+}
+
+create.updateProject(args._[0], args['--shared'], args['--xwalk-shared-library']).done();
 

framework/project.properties

@@ -14,3 +14,4 @@ target=android-21
 apk-configurations=
 renderscript.opt.level=O0
 android.library=true
+android.library.reference.1=xwalk_core_library

framework/src/org/apache/cordova/App.java

@@ -205,7 +205,7 @@ else if (value.getClass().equals(Integer.class)) {
     public void clearHistory() {
         cordova.getActivity().runOnUiThread(new Runnable() {
             public void run() {
-                webView.clearHistory();
+                webView.getNavigationHistory().clear();
             }
         });
     }