Skip to content

Commit

Permalink
Removing server-side of AndroidDriver and deprecating client side.
Browse files Browse the repository at this point in the history
  • Loading branch information
shs96c committed Dec 9, 2013
1 parent 00a3c7d commit ef9d578
Show file tree
Hide file tree
Showing 43 changed files with 6 additions and 1,786 deletions.
1 change: 0 additions & 1 deletion .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 2 additions & 17 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ verbose(false)

# The CrazyFun build grammar. There's no magic here, just ruby
require 'rake-tasks/crazy_fun'
require 'rake-tasks/crazy_fun/mappings/android'
require 'rake-tasks/crazy_fun/mappings/export'
require 'rake-tasks/crazy_fun/mappings/folder'
require 'rake-tasks/crazy_fun/mappings/gcc'
Expand Down Expand Up @@ -72,7 +71,6 @@ crazy_fun = CrazyFun.new
#
# If crazy fun doesn't know how to handle a particular output type ("java_library"
# in the example above) then it will throw an exception, stopping the build
AndroidMappings.new.add_all(crazy_fun)
ExportMappings.new.add_all(crazy_fun)
FolderMappings.new.add_all(crazy_fun)
GccMappings.new.add_all(crazy_fun)
Expand All @@ -89,7 +87,7 @@ VisualStudioMappings.new.add_all(crazy_fun)
# need to fall back to prebuilt binaries. The prebuilt binaries are stored in
# a directory structure identical to that used in the "build" folder, but
# rooted at one of the following locations:
["android/prebuilt", "cpp/prebuilt", "ide/main/prebuilt", "javascript/firefox-driver/prebuilt"].each do |pre|
["cpp/prebuilt", "ide/main/prebuilt", "javascript/firefox-driver/prebuilt"].each do |pre|
crazy_fun.prebuilt_roots << pre
end

Expand All @@ -103,7 +101,7 @@ crazy_fun.create_tasks(Dir["**/build.desc"])
task :default => [:test]


task :all => [:'selenium-java', :'android']
task :all => [:'selenium-java']
task :all_zip => [:'selenium-java_zip']
task :chrome => [ "//java/client/src/org/openqa/selenium/chrome" ]
task :common_core => [ "//common:core" ]
Expand Down Expand Up @@ -142,7 +140,6 @@ task :test_javascript => [
'//javascript/webdriver:test:run',
'//javascript/selenium-atoms:test:run',
'//javascript/selenium-core:test:run']
task :test_android => ["//java/client/test/org/openqa/selenium/android:android-test:run"]
task :test_chrome => [ "//java/client/test/org/openqa/selenium/chrome:test:run" ]
task :test_chrome_atoms => [
'//javascript/atoms:test_chrome:run',
Expand Down Expand Up @@ -179,9 +176,6 @@ task :test_support => [
"//java/client/test/org/openqa/selenium/support:LargeTests:run"
]
task :test_iphone => [:test_iphone_server, '//java/client/test/org/openqa/selenium/iphone:test:run']
task :android => [:android_client, :android_server]
task :android_client => ['//java/client/src/org/openqa/selenium/android']
task :android_server => ['//android:android-server']

# TODO(simon): test-core should go first, but it's changing the least for now.
task :test_selenium => [ :'test-rc', :'test-v1-emulation', :'test-core']
Expand Down Expand Up @@ -231,9 +225,6 @@ task :test_java => [
:test_java_webdriver,
:test_selenium,
"test_grid",
# Android should be installed and the tests should be ran
# before commits.
:test_android
]

task :test_rb => [
Expand Down Expand Up @@ -270,13 +261,8 @@ task :clean do
rm_rf 'build/'
rm_rf 'iphone/build/'
rm_rf 'iphone/src/objc/atoms.h'
rm_rf 'android/bin/'
rm_rf 'android/build/'
rm_rf 'android/libs/'
rm_rf 'android/client/bin/'
rm_rf 'java/client/build/'
rm_rf 'dist/'
Android::Clean.new()
end

task :dotnet => [ "//dotnet", "//dotnet:support", "//dotnet:core", "//dotnet:webdriverbackedselenium" ]
Expand Down Expand Up @@ -671,7 +657,6 @@ task :release => [
'//java/server/src/org/openqa/selenium/server:server:zip',
'//java/server/src/org/openqa/grid/selenium:selenium:zip',
'//java/client/src/org/openqa/selenium:client-combined:zip',
'//android:android-server'
] do |t|
# Unzip each of the deps and rename the pieces that need renaming
renames = {
Expand Down
12 changes: 0 additions & 12 deletions android/.classpath

This file was deleted.

1 change: 0 additions & 1 deletion android/.gitignore

This file was deleted.

53 changes: 0 additions & 53 deletions android/.project

This file was deleted.

53 changes: 0 additions & 53 deletions android/AndroidManifest.xml

This file was deleted.

6 changes: 0 additions & 6 deletions android/android.eml

This file was deleted.

28 changes: 0 additions & 28 deletions android/android.iml

This file was deleted.

24 changes: 0 additions & 24 deletions android/build.desc

This file was deleted.

40 changes: 0 additions & 40 deletions android/build.xml

This file was deleted.

7 changes: 0 additions & 7 deletions android/gen/org/openqa/selenium/android/app/R.java

This file was deleted.

Binary file removed android/prebuilt/android-server.apk
Binary file not shown.
11 changes: 0 additions & 11 deletions android/project.properties

This file was deleted.

Binary file removed android/res/drawable/alert_dialog_icon.png
Binary file not shown.
Binary file removed android/res/drawable/ic_menu_add.png
Binary file not shown.
Binary file removed android/res/drawable/ic_menu_delete.png
Binary file not shown.
Binary file removed android/res/drawable/ic_menu_share.png
Binary file not shown.
Binary file removed android/res/drawable/selenium_icon.png
Binary file not shown.
28 changes: 0 additions & 28 deletions android/res/layout/single_session_layout.xml

This file was deleted.

19 changes: 0 additions & 19 deletions android/res/values/strings.xml

This file was deleted.

12 changes: 0 additions & 12 deletions android/res/xml/preferences.xml

This file was deleted.

Loading

0 comments on commit ef9d578

Please sign in to comment.