|
Revert 179189
Failed to rename package name in buildbot scripts. Broke buildbots.
> Add apk for running content_browsertests
>
> Split off org.chromium.content_shell into:
> org.chromium.content_shell - content shell java code, builds a jar, directory structure similar to other jar targets
> org.chromium.content_shell_apk - application code to build content_shell_apk, directory structure similar to that of android application
> org.chromium.content_browsertests_apk - application code to build content_browsertests_apk
>
> Also splitting content/shell/android/res into:
> - content/shell/android/java/res
> - content/shell/android/shell_apk/res
>
> Both content_shell_apk and content_browsertests_apk will depend on content_shell_java target to include java/res needed to show a shell based browser.
>
> I will do another CL to move The java files for content_shell_tests_apk to content_shell_apk package.
>
> BUG= 138275
>
>
> Review URL: https://chromiumcodereview.appspot.com/12047068
TBR=nileshagrawal@chromium.org
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=179211
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+66 lines, -862 lines) |
Patch |
|
M |
base/message_loop.h
|
View
|
|
1 chunk |
+3 lines, -4 lines |
0 comments
|
Download
|
|
M |
base/message_loop.cc
|
View
|
|
1 chunk |
+2 lines, -5 lines |
0 comments
|
Download
|
|
M |
base/test/test_support_android.cc
|
View
|
|
1 chunk |
+1 line, -2 lines |
0 comments
|
Download
|
|
M |
build/java_apk.gypi
|
View
|
|
2 chunks |
+5 lines, -3 lines |
0 comments
|
Download
|
|
M |
content/content.gyp
|
View
|
|
1 chunk |
+0 lines, -1 line |
0 comments
|
Download
|
|
M |
content/content_shell.gypi
|
View
|
|
5 chunks |
+15 lines, -31 lines |
0 comments
|
Download
|
|
M |
content/content_tests.gypi
|
View
|
|
4 chunks |
+7 lines, -24 lines |
0 comments
|
Download
|
|
M |
content/public/android/javatests/src/org/chromium/content/browser/CommandLineTest.java
|
View
|
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
|
M |
content/public/android/javatests/src/org/chromium/content/browser/ContentDetectionTestBase.java
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
|
M |
content/public/android/javatests/src/org/chromium/content/browser/ContentViewTestBase.java
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
content/public/android/javatests/src/org/chromium/content/browser/InterstitialPageTest.java
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
content/public/android/javatests/src/org/chromium/content/browser/NavigationTest.java
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
content/public/test/content_test_suite_base.cc
|
View
|
|
2 chunks |
+0 lines, -17 lines |
0 comments
|
Download
|
|
D |
content/shell/android/browsertests_apk/AndroidManifest.xml
|
View
|
|
1 chunk |
+0 lines, -72 lines |
0 comments
|
Download
|
|
D |
content/shell/android/browsertests_apk/content_browser_tests_android.cc
|
View
|
|
1 chunk |
+0 lines, -127 lines |
0 comments
|
Download
|
|
D |
content/shell/android/browsertests_apk/res/layout/test_activity.xml
|
View
|
|
1 chunk |
+0 lines, -14 lines |
0 comments
|
Download
|
|
D |
content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java
|
View
|
|
1 chunk |
+0 lines, -46 lines |
0 comments
|
Download
|
|
D |
content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsApplication.java
|
View
|
|
1 chunk |
+0 lines, -31 lines |
0 comments
|
Download
|
|
A + |
content/shell/android/java/AndroidManifest.xml
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
|
D |
content/shell/android/java/res/drawable/progress.xml
|
View
|
|
1 chunk |
+0 lines, -13 lines |
0 comments
|
Download
|
|
D |
content/shell/android/java/res/layout/shell_view.xml
|
View
|
|
1 chunk |
+0 lines, -48 lines |
0 comments
|
Download
|
|
D |
content/shell/android/java/res/values/strings.xml
|
View
|
|
1 chunk |
+0 lines, -11 lines |
0 comments
|
Download
|
|
A + |
content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
|
A + |
content/shell/android/java/src/org/chromium/content_shell/ContentShellApplication.java
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
|
M |
content/shell/android/java/src/org/chromium/content_shell/ShellManager.java
|
View
|
|
2 chunks |
+2 lines, -3 lines |
0 comments
|
Download
|
|
M |
content/shell/android/javatests/AndroidManifest.xml
|
View
|
|
2 chunks |
+3 lines, -3 lines |
0 comments
|
Download
|
|
M |
content/shell/android/javatests/src/org/chromium/content_shell/ContentShellTestBase.java
|
View
|
|
1 chunk |
+0 lines, -1 line |
0 comments
|
Download
|
|
M |
content/shell/android/javatests/src/org/chromium/content_shell/ContentShellUrlTest.java
|
View
|
|
1 chunk |
+0 lines, -1 line |
0 comments
|
Download
|
|
A + |
content/shell/android/res/drawable/progress.xml
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
|
A + |
content/shell/android/res/layout/content_shell_activity.xml
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
|
A + |
content/shell/android/res/layout/shell_view.xml
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
|
A + |
content/shell/android/res/values/strings.xml
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
|
D |
content/shell/android/shell_apk/AndroidManifest.xml
|
View
|
|
1 chunk |
+0 lines, -72 lines |
0 comments
|
Download
|
|
D |
content/shell/android/shell_apk/res/layout/content_shell_activity.xml
|
View
|
|
1 chunk |
+0 lines, -14 lines |
0 comments
|
Download
|
|
D |
content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java
|
View
|
|
1 chunk |
+0 lines, -215 lines |
0 comments
|
Download
|
|
D |
content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellApplication.java
|
View
|
|
1 chunk |
+0 lines, -35 lines |
0 comments
|
Download
|
|
D |
content/shell/android/shell_jni_registrar.h
|
View
|
|
1 chunk |
+0 lines, -19 lines |
0 comments
|
Download
|
|
D |
content/shell/android/shell_jni_registrar.cc
|
View
|
|
1 chunk |
+0 lines, -30 lines |
0 comments
|
Download
|
|
M |
content/shell/android/shell_library_loader.cc
|
View
|
|
1 chunk |
+11 lines, -3 lines |
0 comments
|
Download
|
|
M |
content/test/content_test_launcher.cc
|
View
|
|
3 chunks |
+0 lines, -19 lines |
0 comments
|
Download
|
|
M |
content/test/run_all_unittests.cc
|
View
|
|
1 chunk |
+18 lines, -0 lines |
0 comments
|
Download
|
Total messages: 1 (0 generated)
|