From 40d60ac43ea127b183de5f388b7e7e693e61c745 Mon Sep 17 00:00:00 2001
From: Dounia Berrada <berrada@google.com>
Date: Fri, 6 Jan 2012 22:14:12 +0000
Subject: [PATCH] DouniaBerrada: Moving Android library to the java tree.

r15429
---
 .classpath                                    |  5 +--
 .idea/compiler.xml                            |  3 ++
 android/app/build.desc                        |  2 +-
 android/app/build.xml                         |  2 +-
 .../selenium/android/AndroidDriver.java       |  2 +-
 .../selenium/android/app/MainActivity.java    |  5 ++-
 .../selenium/android/server/JettyService.java |  2 +-
 .../android/server/handler/DragElement.java   |  2 +-
 .../server/handler/GetCssProperty.java        |  2 +-
 .../server/handler/GetElementDisplayed.java   |  2 +-
 .../server/handler/GetElementLocation.java    |  2 +-
 .../server/handler/GetElementSize.java        |  2 +-
 .../server/handler/HoverOverElement.java      |  2 +-
 android/library/.classpath                    |  6 ----
 android/library/.project                      | 33 -------------------
 .../org/openqa/selenium/android/build.desc    | 11 -------
 .../org/openqa/selenium/android/build.desc    | 10 ++++++
 .../android/library}/AndroidAtoms.java        |  2 +-
 .../android/library}/AndroidCoordinates.java  |  2 +-
 .../android/library}/AndroidKeys.java         |  2 +-
 .../android/library}/AndroidLocalStorage.java |  2 +-
 .../android/library}/AndroidLogs.java         |  2 +-
 .../library}/AndroidSessionStorage.java       |  2 +-
 .../android/library}/AndroidTouchScreen.java  |  2 +-
 .../android/library}/AndroidWebDriver.java    |  4 +--
 .../android/library}/AndroidWebElement.java   |  2 +-
 .../android/library}/ChromeClient.java        |  2 +-
 .../selenium/android/library}/DomWindow.java  |  2 +-
 .../android/library}/EventSender.java         |  2 +-
 .../android/library}/JavascriptExecutor.java  |  2 +-
 .../android/library}/JavascriptInterface.java |  2 +-
 .../library}/JavascriptResultNotifier.java    |  2 +-
 .../selenium/android/library}/Logger.java     |  2 +-
 .../android/library}/NetworkStateHandler.java |  2 +-
 .../library}/SessionCookieManager.java        |  2 +-
 .../selenium/android/library}/ViewClient.java |  2 +-
 .../android/library}/WebDriverWebView.java    |  2 +-
 .../android/library}/WebViewManager.java      |  2 +-
 properties.yml                                |  9 ++---
 selenium.iml                                  | 25 +++++++++++++-
 40 files changed, 77 insertions(+), 94 deletions(-)
 delete mode 100644 android/library/.classpath
 delete mode 100644 android/library/.project
 delete mode 100644 android/library/src/java/org/openqa/selenium/android/build.desc
 rename {android/library/src/java/org/openqa/selenium/android => java/client/src/org/openqa/selenium/android/library}/AndroidAtoms.java (99%)
 rename {android/library/src/java/org/openqa/selenium/android => java/client/src/org/openqa/selenium/android/library}/AndroidCoordinates.java (96%)
 rename {android/library/src/java/org/openqa/selenium/android => java/client/src/org/openqa/selenium/android/library}/AndroidKeys.java (98%)
 rename {android/library/src/java/org/openqa/selenium/android => java/client/src/org/openqa/selenium/android/library}/AndroidLocalStorage.java (97%)
 rename {android/library/src/java/org/openqa/selenium/android => java/client/src/org/openqa/selenium/android/library}/AndroidLogs.java (96%)
 rename {android/library/src/java/org/openqa/selenium/android => java/client/src/org/openqa/selenium/android/library}/AndroidSessionStorage.java (97%)
 rename {android/library/src/java/org/openqa/selenium/android => java/client/src/org/openqa/selenium/android/library}/AndroidTouchScreen.java (99%)
 rename {android/library/src/java/org/openqa/selenium/android => java/client/src/org/openqa/selenium/android/library}/AndroidWebDriver.java (99%)
 rename {android/library/src/java/org/openqa/selenium/android => java/client/src/org/openqa/selenium/android/library}/AndroidWebElement.java (99%)
 rename {android/library/src/java/org/openqa/selenium/android => java/client/src/org/openqa/selenium/android/library}/ChromeClient.java (98%)
 rename {android/library/src/java/org/openqa/selenium/android => java/client/src/org/openqa/selenium/android/library}/DomWindow.java (94%)
 rename {android/library/src/java/org/openqa/selenium/android => java/client/src/org/openqa/selenium/android/library}/EventSender.java (98%)
 rename {android/library/src/java/org/openqa/selenium/android => java/client/src/org/openqa/selenium/android/library}/JavascriptExecutor.java (97%)
 rename {android/library/src/java/org/openqa/selenium/android => java/client/src/org/openqa/selenium/android/library}/JavascriptInterface.java (96%)
 rename {android/library/src/java/org/openqa/selenium/android => java/client/src/org/openqa/selenium/android/library}/JavascriptResultNotifier.java (93%)
 rename {android/library/src/java/org/openqa/selenium/android => java/client/src/org/openqa/selenium/android/library}/Logger.java (96%)
 rename {android/library/src/java/org/openqa/selenium/android => java/client/src/org/openqa/selenium/android/library}/NetworkStateHandler.java (98%)
 rename {android/library/src/java/org/openqa/selenium/android => java/client/src/org/openqa/selenium/android/library}/SessionCookieManager.java (95%)
 rename {android/library/src/java/org/openqa/selenium/android => java/client/src/org/openqa/selenium/android/library}/ViewClient.java (98%)
 rename {android/library/src/java/org/openqa/selenium/android => java/client/src/org/openqa/selenium/android/library}/WebDriverWebView.java (98%)
 rename {android/library/src/java/org/openqa/selenium/android => java/client/src/org/openqa/selenium/android/library}/WebViewManager.java (98%)

diff --git a/.classpath b/.classpath
index 030dd374f79a1..52dfe47867a85 100644
--- a/.classpath
+++ b/.classpath
@@ -5,6 +5,7 @@
 	<classpathentry kind="src" path="java/client/src"/>
 	<classpathentry kind="src" path="java/client/test"/>
 	<classpathentry kind="src" path="java/server/test"/>
+	<classpathentry kind="src" path="android"/>
 	<classpathentry kind="lib" path="third_party/java/junit/junit-dep-4.10.jar" sourcepath="third_party/java/junit/junit-dep-4.10-src.jar"/>
 	<classpathentry kind="lib" path="third_party/java/easymock/easymockclassextension-2.4.jar"/>
 	<classpathentry kind="lib" path="third_party/java/htmlunit/htmlunit-core-js-2.9.jar"/>
@@ -21,8 +22,8 @@
 	<classpathentry kind="lib" path="third_party/java/commons-codec/commons-codec-1.4.jar"/>
 	<classpathentry kind="lib" path="third_party/java/hamcrest/hamcrest-all-1.1.jar"/>
 	<classpathentry kind="lib" path="third_party/java/commons-logging/commons-logging-1.1.1.jar"/>
-        <classpathentry kind="lib" path="third_party/java/jna/jna-3.4.0.jar"/>
-        <classpathentry kind="lib" path="third_party/java/jna/jna-platform-3.4.0.jar"/>
+	<classpathentry kind="lib" path="third_party/java/jna/jna-3.4.0.jar"/>
+	<classpathentry kind="lib" path="third_party/java/jna/jna-platform-3.4.0.jar"/>
 	<classpathentry kind="lib" path="third_party/java/jetty/jetty-lite-7.2.0-repackaged-for-android.jar"/>
 	<classpathentry kind="lib" path="third_party/java/mx4j/mx4j-tools-3.0.1.jar"/>
 	<classpathentry kind="lib" path="third_party/java/jetty/jetty-webapp-7.2.0.v20101020.jar"/>
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index afd0e55ca4a60..953d4efa1702b 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -18,5 +18,8 @@
     </wildcardResourcePatterns>
     <annotationProcessing enabled="false" useClasspath="true" />
   </component>
+  <component name="JavacSettings">
+    <option name="MAXIMUM_HEAP_SIZE" value="800" />
+  </component>
 </project>
 
diff --git a/android/app/build.desc b/android/app/build.desc
index 682850fe347e3..0f34a5c049763 100644
--- a/android/app/build.desc
+++ b/android/app/build.desc
@@ -11,7 +11,7 @@ java_library(name = "server",
   ],
   deps = [
     ":r",
-    "//android/library/src/java/org/openqa/selenium/android:android_library",
+    "//java/client/src/org/openqa/selenium/android:android_library",
     "//java/client/src/org/openqa/selenium/remote",
     "//java/client/src/org/openqa/selenium/support",
     "//java/client/src/org/openqa/selenium/io",
diff --git a/android/app/build.xml b/android/app/build.xml
index aeaf7abc935d8..7ded6374d736b 100644
--- a/android/app/build.xml
+++ b/android/app/build.xml
@@ -79,7 +79,7 @@
     <copy file="${third_party.location}/java/guava-libraries/guava-10.0.1.jar" todir="libs/"  />
     <copy file="${third_party.location}/java/jetty/jetty-lite-7.2.0-repackaged-for-android.jar" todir="libs/" />
     <copy file="${third_party.location}/java/json/json-20080701.jar" todir="libs/" />
-    <copy file="${build.location}/android/library/src/java/org/openqa/selenium/android/android_library.jar" todir="libs" />
+    <copy file="${build.location}/java/client/src/java/org/openqa/selenium/android/android_library.jar" todir="libs" />
     <copy file="${build.location}/java/client/src/org/openqa/selenium/io/io.jar" todir="libs" />
     <copy file="${third_party.location}/java/junit/junit-dep-4.10.jar" todir="libs/" />
 
diff --git a/android/app/src/java/org/openqa/selenium/android/AndroidDriver.java b/android/app/src/java/org/openqa/selenium/android/AndroidDriver.java
index 26cfc7df5b366..c9498d9b1883a 100644
--- a/android/app/src/java/org/openqa/selenium/android/AndroidDriver.java
+++ b/android/app/src/java/org/openqa/selenium/android/AndroidDriver.java
@@ -23,7 +23,7 @@
 
 import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.WebElement;
-import org.openqa.selenium.android.AndroidWebDriver;
+import org.openqa.selenium.android.library.AndroidWebDriver;
 import org.openqa.selenium.HasTouchScreen;
 import org.openqa.selenium.html5.BrowserConnection;
 import org.openqa.selenium.html5.LocalStorage;
diff --git a/android/app/src/java/org/openqa/selenium/android/app/MainActivity.java b/android/app/src/java/org/openqa/selenium/android/app/MainActivity.java
index 42a0eaa2e90e5..a407003a20b22 100644
--- a/android/app/src/java/org/openqa/selenium/android/app/MainActivity.java
+++ b/android/app/src/java/org/openqa/selenium/android/app/MainActivity.java
@@ -16,7 +16,6 @@
 
 package org.openqa.selenium.android.app;
 
-import static java.util.logging.Level.OFF;
 import static org.openqa.selenium.logging.LogType.DRIVER;
 import static org.openqa.selenium.remote.CapabilityType.LOGGING_PREFS;
 
@@ -28,8 +27,8 @@
 import android.os.Bundle;
 import android.os.IBinder;
 
-import org.openqa.selenium.android.AndroidWebDriver;
-import org.openqa.selenium.android.Logger;
+import org.openqa.selenium.android.library.AndroidWebDriver;
+import org.openqa.selenium.android.library.Logger;
 import org.openqa.selenium.android.server.JettyService;
 import org.openqa.selenium.logging.LoggingPreferences;
 import org.openqa.selenium.remote.CapabilityType;
diff --git a/android/app/src/java/org/openqa/selenium/android/server/JettyService.java b/android/app/src/java/org/openqa/selenium/android/server/JettyService.java
index dad00a3630cf6..01337e7033ec3 100644
--- a/android/app/src/java/org/openqa/selenium/android/server/JettyService.java
+++ b/android/app/src/java/org/openqa/selenium/android/server/JettyService.java
@@ -23,7 +23,7 @@
 import org.eclipse.jetty.server.handler.HandlerList;
 import org.eclipse.jetty.server.nio.SelectChannelConnector;
 import org.eclipse.jetty.servlet.ServletHolder;
-import org.openqa.selenium.android.Logger;
+import org.openqa.selenium.android.library.Logger;
 import org.openqa.selenium.android.Platform;
 import org.openqa.selenium.android.app.R;
 
diff --git a/android/app/src/java/org/openqa/selenium/android/server/handler/DragElement.java b/android/app/src/java/org/openqa/selenium/android/server/handler/DragElement.java
index da3e8e35e038c..0b7330826d402 100644
--- a/android/app/src/java/org/openqa/selenium/android/server/handler/DragElement.java
+++ b/android/app/src/java/org/openqa/selenium/android/server/handler/DragElement.java
@@ -17,7 +17,7 @@
 
 package org.openqa.selenium.android.server.handler;
 
-import org.openqa.selenium.android.AndroidWebElement;
+import org.openqa.selenium.android.library.AndroidWebElement;
 import org.openqa.selenium.remote.server.JsonParametersAware;
 import org.openqa.selenium.remote.server.Session;
 import org.openqa.selenium.remote.server.rest.ResultType;
diff --git a/android/app/src/java/org/openqa/selenium/android/server/handler/GetCssProperty.java b/android/app/src/java/org/openqa/selenium/android/server/handler/GetCssProperty.java
index 6e2f36972ce38..417320b68cc43 100644
--- a/android/app/src/java/org/openqa/selenium/android/server/handler/GetCssProperty.java
+++ b/android/app/src/java/org/openqa/selenium/android/server/handler/GetCssProperty.java
@@ -17,7 +17,7 @@
 
 package org.openqa.selenium.android.server.handler;
 
-import org.openqa.selenium.android.AndroidWebElement;
+import org.openqa.selenium.android.library.AndroidWebElement;
 import org.openqa.selenium.remote.server.Session;
 import org.openqa.selenium.remote.server.rest.ResultType;
 
diff --git a/android/app/src/java/org/openqa/selenium/android/server/handler/GetElementDisplayed.java b/android/app/src/java/org/openqa/selenium/android/server/handler/GetElementDisplayed.java
index 600a8dce32a03..79328d7435c91 100644
--- a/android/app/src/java/org/openqa/selenium/android/server/handler/GetElementDisplayed.java
+++ b/android/app/src/java/org/openqa/selenium/android/server/handler/GetElementDisplayed.java
@@ -17,7 +17,7 @@
 
 package org.openqa.selenium.android.server.handler;
 
-import org.openqa.selenium.android.AndroidWebElement;
+import org.openqa.selenium.android.library.AndroidWebElement;
 import org.openqa.selenium.remote.server.Session;
 import org.openqa.selenium.remote.server.rest.ResultType;
 
diff --git a/android/app/src/java/org/openqa/selenium/android/server/handler/GetElementLocation.java b/android/app/src/java/org/openqa/selenium/android/server/handler/GetElementLocation.java
index 6a870a4fceef0..1b7a61490af7a 100644
--- a/android/app/src/java/org/openqa/selenium/android/server/handler/GetElementLocation.java
+++ b/android/app/src/java/org/openqa/selenium/android/server/handler/GetElementLocation.java
@@ -17,7 +17,7 @@
 
 package org.openqa.selenium.android.server.handler;
 
-import org.openqa.selenium.android.AndroidWebElement;
+import org.openqa.selenium.android.library.AndroidWebElement;
 import org.openqa.selenium.remote.server.Session;
 import org.openqa.selenium.remote.server.rest.ResultType;
 
diff --git a/android/app/src/java/org/openqa/selenium/android/server/handler/GetElementSize.java b/android/app/src/java/org/openqa/selenium/android/server/handler/GetElementSize.java
index 8345b263a9b3d..d2624e9a5201b 100644
--- a/android/app/src/java/org/openqa/selenium/android/server/handler/GetElementSize.java
+++ b/android/app/src/java/org/openqa/selenium/android/server/handler/GetElementSize.java
@@ -17,7 +17,7 @@
 
 package org.openqa.selenium.android.server.handler;
 
-import org.openqa.selenium.android.AndroidWebElement;
+import org.openqa.selenium.android.library.AndroidWebElement;
 import org.openqa.selenium.remote.server.Session;
 import org.openqa.selenium.remote.server.rest.ResultType;
 
diff --git a/android/app/src/java/org/openqa/selenium/android/server/handler/HoverOverElement.java b/android/app/src/java/org/openqa/selenium/android/server/handler/HoverOverElement.java
index 70b0cc82d428b..f582eb4007f44 100644
--- a/android/app/src/java/org/openqa/selenium/android/server/handler/HoverOverElement.java
+++ b/android/app/src/java/org/openqa/selenium/android/server/handler/HoverOverElement.java
@@ -17,7 +17,7 @@
 
 package org.openqa.selenium.android.server.handler;
 
-import org.openqa.selenium.android.AndroidWebElement;
+import org.openqa.selenium.android.library.AndroidWebElement;
 import org.openqa.selenium.remote.server.Session;
 import org.openqa.selenium.remote.server.rest.ResultType;
 
diff --git a/android/library/.classpath b/android/library/.classpath
deleted file mode 100644
index beef69a111edb..0000000000000
--- a/android/library/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/android/library/.project b/android/library/.project
deleted file mode 100644
index e316075820844..0000000000000
--- a/android/library/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>Library</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/android/library/src/java/org/openqa/selenium/android/build.desc b/android/library/src/java/org/openqa/selenium/android/build.desc
deleted file mode 100644
index 4c695091d79e4..0000000000000
--- a/android/library/src/java/org/openqa/selenium/android/build.desc
+++ /dev/null
@@ -1,11 +0,0 @@
-
-java_library(name = "android_library",
-  srcs = ["*.java"],
-  deps = [
-          "//java/client/src/org/openqa/selenium:webdriver-api",
-          "//java/client/src/org/openqa/selenium/remote:common",
-          "//java/server/src/org/openqa/selenium/remote/server:server",
-          "//third_party/java/android",
-          "//third_party/java/guava-libraries",
-          ]
-)
diff --git a/java/client/src/org/openqa/selenium/android/build.desc b/java/client/src/org/openqa/selenium/android/build.desc
index 024a13629c483..667be37852f84 100644
--- a/java/client/src/org/openqa/selenium/android/build.desc
+++ b/java/client/src/org/openqa/selenium/android/build.desc
@@ -7,3 +7,13 @@ java_library(name = "android",
     "//java/client/src/org/openqa/selenium/remote",
   ])
 
+java_library(name = "android_library",
+  srcs = ["library/*.java"],
+  deps = [
+          "//java/client/src/org/openqa/selenium:webdriver-api",
+          "//java/client/src/org/openqa/selenium/remote:common",
+          "//java/server/src/org/openqa/selenium/remote/server:server",
+          "//third_party/java/android",
+          "//third_party/java/guava-libraries",
+          ]
+)
diff --git a/android/library/src/java/org/openqa/selenium/android/AndroidAtoms.java b/java/client/src/org/openqa/selenium/android/library/AndroidAtoms.java
similarity index 99%
rename from android/library/src/java/org/openqa/selenium/android/AndroidAtoms.java
rename to java/client/src/org/openqa/selenium/android/library/AndroidAtoms.java
index 2ac34199efa7d..cedad00d220c7 100644
--- a/android/library/src/java/org/openqa/selenium/android/AndroidAtoms.java
+++ b/java/client/src/org/openqa/selenium/android/library/AndroidAtoms.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.openqa.selenium.android;
+package org.openqa.selenium.android.library;
 
 import java.util.EnumSet;
 import java.util.HashMap;
diff --git a/android/library/src/java/org/openqa/selenium/android/AndroidCoordinates.java b/java/client/src/org/openqa/selenium/android/library/AndroidCoordinates.java
similarity index 96%
rename from android/library/src/java/org/openqa/selenium/android/AndroidCoordinates.java
rename to java/client/src/org/openqa/selenium/android/library/AndroidCoordinates.java
index 1c8bc7acd1ef1..e70437a00057b 100644
--- a/android/library/src/java/org/openqa/selenium/android/AndroidCoordinates.java
+++ b/java/client/src/org/openqa/selenium/android/library/AndroidCoordinates.java
@@ -15,7 +15,7 @@
 limitations under the License.
 */
 
-package org.openqa.selenium.android;
+package org.openqa.selenium.android.library;
 
 import org.openqa.selenium.Point;
 import org.openqa.selenium.interactions.internal.Coordinates;
diff --git a/android/library/src/java/org/openqa/selenium/android/AndroidKeys.java b/java/client/src/org/openqa/selenium/android/library/AndroidKeys.java
similarity index 98%
rename from android/library/src/java/org/openqa/selenium/android/AndroidKeys.java
rename to java/client/src/org/openqa/selenium/android/library/AndroidKeys.java
index 1084907dddf5c..06dc378fbc826 100644
--- a/android/library/src/java/org/openqa/selenium/android/AndroidKeys.java
+++ b/java/client/src/org/openqa/selenium/android/library/AndroidKeys.java
@@ -15,7 +15,7 @@
 limitations under the License.
 */
 
-package org.openqa.selenium.android;
+package org.openqa.selenium.android.library;
 
 import android.view.KeyEvent;
 
diff --git a/android/library/src/java/org/openqa/selenium/android/AndroidLocalStorage.java b/java/client/src/org/openqa/selenium/android/library/AndroidLocalStorage.java
similarity index 97%
rename from android/library/src/java/org/openqa/selenium/android/AndroidLocalStorage.java
rename to java/client/src/org/openqa/selenium/android/library/AndroidLocalStorage.java
index 1c3f0106d6d44..203b099cd6ed5 100644
--- a/android/library/src/java/org/openqa/selenium/android/AndroidLocalStorage.java
+++ b/java/client/src/org/openqa/selenium/android/library/AndroidLocalStorage.java
@@ -15,7 +15,7 @@
 limitations under the License.
 */
 
-package org.openqa.selenium.android;
+package org.openqa.selenium.android.library;
 
 import org.openqa.selenium.html5.LocalStorage;
 
diff --git a/android/library/src/java/org/openqa/selenium/android/AndroidLogs.java b/java/client/src/org/openqa/selenium/android/library/AndroidLogs.java
similarity index 96%
rename from android/library/src/java/org/openqa/selenium/android/AndroidLogs.java
rename to java/client/src/org/openqa/selenium/android/library/AndroidLogs.java
index cd9c7086dbabd..8570c47fd913e 100644
--- a/android/library/src/java/org/openqa/selenium/android/AndroidLogs.java
+++ b/java/client/src/org/openqa/selenium/android/library/AndroidLogs.java
@@ -14,7 +14,7 @@
 limitations under the License.
 */
 
-package org.openqa.selenium.android;
+package org.openqa.selenium.android.library;
 
 import com.google.common.collect.Lists;
 
diff --git a/android/library/src/java/org/openqa/selenium/android/AndroidSessionStorage.java b/java/client/src/org/openqa/selenium/android/library/AndroidSessionStorage.java
similarity index 97%
rename from android/library/src/java/org/openqa/selenium/android/AndroidSessionStorage.java
rename to java/client/src/org/openqa/selenium/android/library/AndroidSessionStorage.java
index b06bca34b19ba..78ea432edd187 100644
--- a/android/library/src/java/org/openqa/selenium/android/AndroidSessionStorage.java
+++ b/java/client/src/org/openqa/selenium/android/library/AndroidSessionStorage.java
@@ -15,7 +15,7 @@
 limitations under the License.
 */
 
-package org.openqa.selenium.android;
+package org.openqa.selenium.android.library;
 
 import org.openqa.selenium.html5.SessionStorage;
 
diff --git a/android/library/src/java/org/openqa/selenium/android/AndroidTouchScreen.java b/java/client/src/org/openqa/selenium/android/library/AndroidTouchScreen.java
similarity index 99%
rename from android/library/src/java/org/openqa/selenium/android/AndroidTouchScreen.java
rename to java/client/src/org/openqa/selenium/android/library/AndroidTouchScreen.java
index 1a45980c3331a..39c1ecbaa0ded 100644
--- a/android/library/src/java/org/openqa/selenium/android/AndroidTouchScreen.java
+++ b/java/client/src/org/openqa/selenium/android/library/AndroidTouchScreen.java
@@ -16,7 +16,7 @@
 limitations under the License.
 */
 
-package org.openqa.selenium.android;
+package org.openqa.selenium.android.library;
 
 import com.google.common.collect.Lists;
 
diff --git a/android/library/src/java/org/openqa/selenium/android/AndroidWebDriver.java b/java/client/src/org/openqa/selenium/android/library/AndroidWebDriver.java
similarity index 99%
rename from android/library/src/java/org/openqa/selenium/android/AndroidWebDriver.java
rename to java/client/src/org/openqa/selenium/android/library/AndroidWebDriver.java
index 83ccea6e43e2d..2db6d6a565596 100644
--- a/android/library/src/java/org/openqa/selenium/android/AndroidWebDriver.java
+++ b/java/client/src/org/openqa/selenium/android/library/AndroidWebDriver.java
@@ -15,7 +15,7 @@
 limitations under the License.
 */
 
-package org.openqa.selenium.android;
+package org.openqa.selenium.android.library;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -895,7 +895,7 @@ private String executeJavascriptInWebView(final String script) {
     resultReady = false;
     activity.runOnUiThread(new Runnable() {
       public void run() {
-        org.openqa.selenium.android.JavascriptExecutor.executeJs(
+        org.openqa.selenium.android.library.JavascriptExecutor.executeJs(
             webview, notifier, script);
       }
     });
diff --git a/android/library/src/java/org/openqa/selenium/android/AndroidWebElement.java b/java/client/src/org/openqa/selenium/android/library/AndroidWebElement.java
similarity index 99%
rename from android/library/src/java/org/openqa/selenium/android/AndroidWebElement.java
rename to java/client/src/org/openqa/selenium/android/library/AndroidWebElement.java
index 1f50d9c4c2158..7540df32e970d 100644
--- a/android/library/src/java/org/openqa/selenium/android/AndroidWebElement.java
+++ b/java/client/src/org/openqa/selenium/android/library/AndroidWebElement.java
@@ -16,7 +16,7 @@
 limitations under the License.
 */
 
-package org.openqa.selenium.android;
+package org.openqa.selenium.android.library;
 
 import com.google.common.collect.Lists;
 
diff --git a/android/library/src/java/org/openqa/selenium/android/ChromeClient.java b/java/client/src/org/openqa/selenium/android/library/ChromeClient.java
similarity index 98%
rename from android/library/src/java/org/openqa/selenium/android/ChromeClient.java
rename to java/client/src/org/openqa/selenium/android/library/ChromeClient.java
index 73fe18cca8e84..28da37cbfbf64 100644
--- a/android/library/src/java/org/openqa/selenium/android/ChromeClient.java
+++ b/java/client/src/org/openqa/selenium/android/library/ChromeClient.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.openqa.selenium.android;
+package org.openqa.selenium.android.library;
 
 import android.os.Message;
 import android.webkit.JsPromptResult;
diff --git a/android/library/src/java/org/openqa/selenium/android/DomWindow.java b/java/client/src/org/openqa/selenium/android/library/DomWindow.java
similarity index 94%
rename from android/library/src/java/org/openqa/selenium/android/DomWindow.java
rename to java/client/src/org/openqa/selenium/android/library/DomWindow.java
index c02557d5b734c..ac991f5f5daeb 100644
--- a/android/library/src/java/org/openqa/selenium/android/DomWindow.java
+++ b/java/client/src/org/openqa/selenium/android/library/DomWindow.java
@@ -15,7 +15,7 @@
 limitations under the License.
 */
 
-package org.openqa.selenium.android;
+package org.openqa.selenium.android.library;
 
 class DomWindow {
   private final String key;
diff --git a/android/library/src/java/org/openqa/selenium/android/EventSender.java b/java/client/src/org/openqa/selenium/android/library/EventSender.java
similarity index 98%
rename from android/library/src/java/org/openqa/selenium/android/EventSender.java
rename to java/client/src/org/openqa/selenium/android/library/EventSender.java
index ace5039162c3f..443e2125d6f62 100644
--- a/android/library/src/java/org/openqa/selenium/android/EventSender.java
+++ b/java/client/src/org/openqa/selenium/android/library/EventSender.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.openqa.selenium.android;
+package org.openqa.selenium.android.library;
 
 import android.app.Activity;
 import android.util.Log;
diff --git a/android/library/src/java/org/openqa/selenium/android/JavascriptExecutor.java b/java/client/src/org/openqa/selenium/android/library/JavascriptExecutor.java
similarity index 97%
rename from android/library/src/java/org/openqa/selenium/android/JavascriptExecutor.java
rename to java/client/src/org/openqa/selenium/android/library/JavascriptExecutor.java
index d0164d82763d7..61c7407dff6f5 100644
--- a/android/library/src/java/org/openqa/selenium/android/JavascriptExecutor.java
+++ b/java/client/src/org/openqa/selenium/android/library/JavascriptExecutor.java
@@ -15,7 +15,7 @@
 limitations under the License.
 */
 
-package org.openqa.selenium.android;
+package org.openqa.selenium.android.library;
 
 import android.app.Activity;
 import android.webkit.WebView;
diff --git a/android/library/src/java/org/openqa/selenium/android/JavascriptInterface.java b/java/client/src/org/openqa/selenium/android/library/JavascriptInterface.java
similarity index 96%
rename from android/library/src/java/org/openqa/selenium/android/JavascriptInterface.java
rename to java/client/src/org/openqa/selenium/android/library/JavascriptInterface.java
index 3fd0fe8ea1732..d171ce569b2f4 100644
--- a/android/library/src/java/org/openqa/selenium/android/JavascriptInterface.java
+++ b/java/client/src/org/openqa/selenium/android/library/JavascriptInterface.java
@@ -15,7 +15,7 @@
 limitations under the License.
 */
 
-package org.openqa.selenium.android;
+package org.openqa.selenium.android.library;
 
 /**
  * Custom module that is added to the WebView's JavaScript engine to enable callbacks to java
diff --git a/android/library/src/java/org/openqa/selenium/android/JavascriptResultNotifier.java b/java/client/src/org/openqa/selenium/android/library/JavascriptResultNotifier.java
similarity index 93%
rename from android/library/src/java/org/openqa/selenium/android/JavascriptResultNotifier.java
rename to java/client/src/org/openqa/selenium/android/library/JavascriptResultNotifier.java
index 5c00c2235f699..c49fe1f392843 100644
--- a/android/library/src/java/org/openqa/selenium/android/JavascriptResultNotifier.java
+++ b/java/client/src/org/openqa/selenium/android/library/JavascriptResultNotifier.java
@@ -15,7 +15,7 @@
 limitations under the License.
 */
 
-package org.openqa.selenium.android;
+package org.openqa.selenium.android.library;
 
 interface JavascriptResultNotifier {
   void notifyResultReady(String result);
diff --git a/android/library/src/java/org/openqa/selenium/android/Logger.java b/java/client/src/org/openqa/selenium/android/library/Logger.java
similarity index 96%
rename from android/library/src/java/org/openqa/selenium/android/Logger.java
rename to java/client/src/org/openqa/selenium/android/library/Logger.java
index b79002eea5d04..c7281a006ec5d 100644
--- a/android/library/src/java/org/openqa/selenium/android/Logger.java
+++ b/java/client/src/org/openqa/selenium/android/library/Logger.java
@@ -15,7 +15,7 @@
 limitations under the License.
 */
 
-package org.openqa.selenium.android;
+package org.openqa.selenium.android.library;
 
 import java.util.logging.Level;
 
diff --git a/android/library/src/java/org/openqa/selenium/android/NetworkStateHandler.java b/java/client/src/org/openqa/selenium/android/library/NetworkStateHandler.java
similarity index 98%
rename from android/library/src/java/org/openqa/selenium/android/NetworkStateHandler.java
rename to java/client/src/org/openqa/selenium/android/library/NetworkStateHandler.java
index 8de34e66bd278..5db15ef08ccb3 100644
--- a/android/library/src/java/org/openqa/selenium/android/NetworkStateHandler.java
+++ b/java/client/src/org/openqa/selenium/android/library/NetworkStateHandler.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.openqa.selenium.android;
+package org.openqa.selenium.android.library;
 
 import android.app.Activity;
 import android.content.BroadcastReceiver;
diff --git a/android/library/src/java/org/openqa/selenium/android/SessionCookieManager.java b/java/client/src/org/openqa/selenium/android/library/SessionCookieManager.java
similarity index 95%
rename from android/library/src/java/org/openqa/selenium/android/SessionCookieManager.java
rename to java/client/src/org/openqa/selenium/android/library/SessionCookieManager.java
index c659c8f278d9b..ba11fc6f6bedd 100644
--- a/android/library/src/java/org/openqa/selenium/android/SessionCookieManager.java
+++ b/java/client/src/org/openqa/selenium/android/library/SessionCookieManager.java
@@ -15,7 +15,7 @@
 limitations under the License.
 */
 
-package org.openqa.selenium.android;
+package org.openqa.selenium.android.library;
 
 import com.google.common.collect.Sets;
 
diff --git a/android/library/src/java/org/openqa/selenium/android/ViewClient.java b/java/client/src/org/openqa/selenium/android/library/ViewClient.java
similarity index 98%
rename from android/library/src/java/org/openqa/selenium/android/ViewClient.java
rename to java/client/src/org/openqa/selenium/android/library/ViewClient.java
index f58d62c684b74..7d267da9d27e9 100644
--- a/android/library/src/java/org/openqa/selenium/android/ViewClient.java
+++ b/java/client/src/org/openqa/selenium/android/library/ViewClient.java
@@ -15,7 +15,7 @@
 limitations under the License.
 */
 
-package org.openqa.selenium.android;
+package org.openqa.selenium.android.library;
 
 import android.graphics.Bitmap;
 import android.net.http.SslError;
diff --git a/android/library/src/java/org/openqa/selenium/android/WebDriverWebView.java b/java/client/src/org/openqa/selenium/android/library/WebDriverWebView.java
similarity index 98%
rename from android/library/src/java/org/openqa/selenium/android/WebDriverWebView.java
rename to java/client/src/org/openqa/selenium/android/library/WebDriverWebView.java
index fbd7893f4ac3c..762e5d8367900 100644
--- a/android/library/src/java/org/openqa/selenium/android/WebDriverWebView.java
+++ b/java/client/src/org/openqa/selenium/android/library/WebDriverWebView.java
@@ -15,7 +15,7 @@
 limitations under the License.
  */
 
-package org.openqa.selenium.android;
+package org.openqa.selenium.android.library;
 
 import android.util.Log;
 import android.view.KeyEvent;
diff --git a/android/library/src/java/org/openqa/selenium/android/WebViewManager.java b/java/client/src/org/openqa/selenium/android/library/WebViewManager.java
similarity index 98%
rename from android/library/src/java/org/openqa/selenium/android/WebViewManager.java
rename to java/client/src/org/openqa/selenium/android/library/WebViewManager.java
index ed290aaf800eb..b0b25b28e0c40 100644
--- a/android/library/src/java/org/openqa/selenium/android/WebViewManager.java
+++ b/java/client/src/org/openqa/selenium/android/library/WebViewManager.java
@@ -15,7 +15,7 @@
 limitations under the License.
 */
 
-package org.openqa.selenium.android;
+package org.openqa.selenium.android.library;
 
 import com.google.common.collect.HashBiMap;
 
diff --git a/properties.yml b/properties.yml
index d3455eeef6363..1bf47b6917211 100644
--- a/properties.yml
+++ b/properties.yml
@@ -1,15 +1,12 @@
-# Be warned, spaces in paths in this file will cause Bad Things to happen to
-# your build.
-
-default:
+default: 
   android:
     # Path to the android sdk
-    androidsdkpath : "../android_sdk/"
+    androidsdkpath : "/usr/local/google/android_sdk/android-sdk-linux_86/"
     # Target id. To get a list of all targets do "./android list targets".
     # We want whatever matches android 4.0 (IceCreamSandwich API level 14)
     #
     # Note: Android WebDriver will not work on Gingerbread (SDK 2.3) emulator because of
     # an emulator bug. However it will work with Gingerbread (SDK 2.3) devices.
-    androidtarget : "android-14"
+    androidtarget : 29
     # Android platform. You can find supported platforms under androidsdkpath/platforms/
     androidplatform : "android-14"
diff --git a/selenium.iml b/selenium.iml
index 46adf0f792e9f..020d514e35135 100644
--- a/selenium.iml
+++ b/selenium.iml
@@ -1,3 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module classpath="eclipse" classpath-dir="$MODULE_DIR$" type="JAVA_MODULE" version="4" />
+<module classpath="eclipse" classpath-dir="$MODULE_DIR$" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android" name="Android">
+      <configuration>
+        <option name="GEN_FOLDER_RELATIVE_PATH_APT" value="/gen" />
+        <option name="GEN_FOLDER_RELATIVE_PATH_AIDL" value="/gen" />
+        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/AndroidManifest.xml" />
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/res" />
+        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/assets" />
+        <option name="LIBS_FOLDER_RELATIVE_PATH" value="/libs" />
+        <option name="REGENERATE_R_JAVA" value="true" />
+        <option name="REGENERATE_JAVA_BY_AIDL" value="true" />
+        <option name="USE_CUSTOM_APK_RESOURCE_FOLDER" value="false" />
+        <option name="CUSTOM_APK_RESOURCE_FOLDER" value="" />
+        <option name="USE_CUSTOM_COMPILER_MANIFEST" value="false" />
+        <option name="CUSTOM_COMPILER_MANIFEST" value="" />
+        <option name="APK_PATH" value="" />
+        <option name="LIBRARY_PROJECT" value="false" />
+        <option name="RUN_PROCESS_RESOURCES_MAVEN_TASK" value="true" />
+        <option name="GENERATE_UNSIGNED_APK" value="false" />
+      </configuration>
+    </facet>
+  </component>
+</module>