Skip to content

Commit d72b408

Browse files
shs96cshs96c
committed
Base the android apk off the newly cleaned up server core.
1 parent 3622487 commit d72b408

File tree

6 files changed

+52
-41
lines changed

6 files changed

+52
-41
lines changed

‎android/build.desc‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,21 @@ android_r(name = "r",
44
resource = "res",
55
out = "gen/org/openqa/selenium/android/app")
66

7+
# Don't include the src directory: Android's build.xml will build it for us. Madness.
8+
# We also depend on ":r" without actually building it for the same reason
79
java_library(name = "server",
8-
srcs = [
9-
"gen/**/*.java",
10-
"src/java/**/*.java"
11-
],
1210
deps = [
11+
":r",
1312
"//java/client/src/org/openqa/selenium/android:android_library",
1413
"//java/client/src/org/openqa/selenium/browserlaunchers:proxies",
15-
"//java/client/src/org/openqa/selenium/remote:api",
16-
"//java/client/src/org/openqa/selenium/remote:base",
17-
"//java/client/src/org/openqa/selenium/remote:common",
18-
"//java/client/src/org/openqa/selenium/remote:remote",
19-
"//java/client/src/org/openqa/selenium/io",
20-
"//java/client/src/org/openqa/selenium/logging:logging",
21-
"//java/server/src/org/openqa/selenium/remote/server:server_core",
22-
"//java/server/src/org/openqa/selenium/server:logging",
23-
"//third_party/java/android",
14+
"//java/server/src/org/openqa/selenium/remote/server:server_very_core",
15+
"//java/server/src/org/openqa/selenium/remote/server:webbit-http-api",
2416
"//third_party/java/webbit:webbit:uber",
25-
"//third_party/java/guava-libraries:guava-libraries",
2617
])
2718

2819
android_binary(name = "android-server",
2920
manifest = "AndroidManifest.xml",
3021
resource_dir = "res",
3122
deps = [
32-
":server",
23+
":server:project",
3324
])

‎android/build.xml‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -31,26 +31,10 @@
3131
<property name="go" value="./go"/>
3232
<property name="res.raw" value="res/raw"/>
3333

34-
<copy file="${build.location}/java/client/src/org/openqa/selenium/base.jar" tofile="libs/base.jar" />
35-
<copy file="${build.location}/java/client/src/org/openqa/selenium/codecs.jar" tofile="libs/codecs.jar" />
36-
<copy file="${build.location}/java/client/src/org/openqa/selenium/webdriver-api.jar" tofile="libs/webdriver-api.jar" />
37-
<copy file="${build.location}/java/client/src/org/openqa/selenium/remote/api.jar" tofile="libs/webdriver-remote-api.jar" />
38-
<copy file="${build.location}/java/client/src/org/openqa/selenium/remote/base.jar" tofile="libs/webdriver-base.jar" />
39-
<copy file="${build.location}/java/client/src/org/openqa/selenium/remote/common.jar" tofile="libs/webdriver-common.jar" />
40-
<copy file="${build.location}/java/client/src/org/openqa/selenium/remote/remote.jar" tofile="libs/webdriver-client-remote.jar" />
41-
<copy file="${build.location}/java/client/src/org/openqa/selenium/browserlaunchers/proxies.jar" tofile="libs/proxies.jar" />
42-
<copy file="${build.location}/java/client/src/org/openqa/selenium/support/events/events.jar" tofile="libs/events.jar" />
43-
<copy file="${build.location}/java/client/src/org/openqa/selenium/logging/logging.jar" tofile="libs/logging.jar" />
44-
<copy file="${build.location}/java/client/src/org/openqa/selenium/interactions/interactions.jar" tofile="libs/interactions.jar" />
45-
<copy file="${build.location}/java/server/src/org/openqa/selenium/remote/server/resource/resource.jar" tofile="libs/remote-wdserver-resource.jar" />
46-
<copy file="${build.location}/java/server/src/org/openqa/selenium/remote/server/server_very_core.jar" tofile="libs/remote-wdserver-verycore.jar" />
47-
<copy file="${build.location}/java/server/src/org/openqa/selenium/remote/server/server_core.jar" tofile="libs/remote-wdserver.jar" />
48-
<copy file="${build.location}/java/server/src/org/openqa/selenium/server/logging.jar" tofile="libs/remote-logging.jar" />
34+
<copy file="${build.location}/android/server-nodeps.jar" todir="libs" />
4935
<copy file="${build.location}/third_party/java/webbit/webbit-standalone.jar" tofile="libs/webbit-server.jar" />
5036
<copy file="${third_party.location}/java/guava-libraries/guava-14.0.jar" todir="libs/" />
5137
<copy file="${third_party.location}/java/json/json-20080701.jar" todir="libs/" />
52-
<copy file="${build.location}/java/client/src/org/openqa/selenium/android/android_library.jar" todir="libs" />
53-
<copy file="${build.location}/java/client/src/org/openqa/selenium/io/io.jar" todir="libs" />
5438

5539
<import file="${sdk.dir}/tools/ant/build.xml" />
5640
</project>

‎android/gen/org/openqa/selenium/android/app/R.java‎

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,43 @@
1+
/* AUTO-GENERATED FILE. DO NOT MODIFY.
2+
*
3+
* This class was automatically generated by the
4+
* aapt tool from the resource data it found. It
5+
* should not be modified by hand.
6+
*/
7+
18
package org.openqa.selenium.android.app;
29

3-
/* This stub is for using by IDE only. It is NOT the R class actually packed into APK */
410
public final class R {
5-
}
11+
public static final class attr {
12+
}
13+
public static final class drawable {
14+
public static final int alert_dialog_icon=0x7f020000;
15+
public static final int ic_menu_add=0x7f020001;
16+
public static final int ic_menu_delete=0x7f020002;
17+
public static final int ic_menu_share=0x7f020003;
18+
public static final int selenium_icon=0x7f020004;
19+
}
20+
public static final class id {
21+
public static final int rssWebView=0x7f060002;
22+
public static final int status=0x7f060000;
23+
public static final int webview=0x7f060001;
24+
}
25+
public static final class layout {
26+
public static final int single_session_layout=0x7f030000;
27+
}
28+
public static final class string {
29+
public static final int app_name=0x7f050009;
30+
public static final int ctx_menu_navigate=0x7f050001;
31+
public static final int default_session_status=0x7f050002;
32+
public static final int httpd_already_started=0x7f050005;
33+
public static final int httpd_not_running=0x7f050008;
34+
public static final int httpd_not_started=0x7f050004;
35+
public static final int httpd_not_stopped=0x7f050007;
36+
public static final int httpd_started=0x7f050003;
37+
public static final int httpd_stopped=0x7f050006;
38+
public static final int main_title=0x7f050000;
39+
}
40+
public static final class xml {
41+
public static final int preferences=0x7f040000;
42+
}
43+
}

‎android/prebuilt/android-server.apk‎

-27.9 KB
Binary file not shown.

‎java/client/src/org/openqa/selenium/android/build.desc‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,8 @@ java_library(name = "android",
1010
java_library(name = "android_library",
1111
srcs = ["library/*.java"],
1212
deps = [
13-
"//java/client/src/org/openqa/selenium:webdriver-api",
14-
"//java/client/src/org/openqa/selenium/remote:common",
15-
"//java/server/src/org/openqa/selenium/remote/server:server_core",
16-
"//third_party/java/android",
17-
"//third_party/java/guava-libraries",
18-
]
13+
"//java/server/src/org/openqa/selenium/remote/server:server_very_core",
14+
"//third_party/java/android",
15+
"//third_party/java/guava-libraries",
16+
]
1917
)

‎rake-tasks/crazy_fun/mappings/java.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -745,7 +745,7 @@ def handle(fun, dir, args)
745745

746746
CrazyFunJava.ant.jarjar(:jarfile => jar, :duplicate => 'preserve') do |ant|
747747
cp.each do |j|
748-
unless (j.to_s =~ /^third_party/)
748+
unless (j.to_s =~ /^third_party/ || j.to_s =~ /^build\/third_party/)
749749
ant.zipfileset(:src => j, :excludes => "META-INF/BCKEY.DSA,META-INF/BCKEY.SF")
750750
end
751751
end

0 commit comments

Comments
 (0)