|
Android content shell bringup.
Build media java files (we weren't).
Fix adb_install_content_shell for cases where the app was stuck.
Add upstream staging gyp var / #define.
Be more consistent about jar output files (all in lib.java).
Upstream a bunch of random files (e.g. ppapi).
Upstream a bunch of java and native code hit as part of shlib init.
Properly package jar files in content shell.
BUG=
TEST=
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=136219
Total comments: 42
Total comments: 4
Total comments: 1
Total comments: 1
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+1669 lines, -75 lines) |
Patch |
|
M |
base/android/java/base.xml
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
build/android/adb_install_content_shell
|
View
|
|
1 chunk |
+2 lines, -0 lines |
0 comments
|
Download
|
|
M |
build/android/envsetup.sh
|
View
|
|
1 chunk |
+8 lines, -0 lines |
0 comments
|
Download
|
|
M |
build/android/gdb_content_shell
|
View
|
|
2 chunks |
+4 lines, -2 lines |
0 comments
|
Download
|
|
M |
build/common.gypi
|
View
|
|
3 chunks |
+9 lines, -0 lines |
0 comments
|
Download
|
|
M |
build/java.gypi
|
View
|
1
|
2 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
|
M |
content/app/content_main_runner.cc
|
View
|
1
2
3
4
5
|
8 chunks |
+25 lines, -4 lines |
0 comments
|
Download
|
|
A |
content/browser/android/command_line.h
|
View
|
1
|
1 chunk |
+18 lines, -0 lines |
0 comments
|
Download
|
|
A |
content/browser/android/command_line.cc
|
View
|
1
|
1 chunk |
+78 lines, -0 lines |
0 comments
|
Download
|
|
A |
content/browser/android/content_jni_registrar.h
|
View
|
1
|
1 chunk |
+19 lines, -0 lines |
0 comments
|
Download
|
|
A |
content/browser/android/content_jni_registrar.cc
|
View
|
1
|
1 chunk |
+26 lines, -0 lines |
0 comments
|
Download
|
|
A |
content/browser/android/jni_helper.h
|
View
|
1
2
3
4
|
1 chunk |
+92 lines, -0 lines |
0 comments
|
Download
|
|
A |
content/browser/android/jni_helper.cc
|
View
|
1
|
1 chunk |
+158 lines, -0 lines |
0 comments
|
Download
|
|
M |
content/browser/android/library_loader_hooks.cc
|
View
|
1
|
4 chunks |
+24 lines, -6 lines |
0 comments
|
Download
|
|
A |
content/browser/android/trace_event_binding.h
|
View
|
1
|
1 chunk |
+13 lines, -0 lines |
0 comments
|
Download
|
|
A |
content/browser/android/trace_event_binding.cc
|
View
|
1
|
1 chunk |
+93 lines, -0 lines |
0 comments
|
Download
|
|
M |
content/content.gyp
|
View
|
1
2
3
4
5
6
7
|
1 chunk |
+6 lines, -16 lines |
0 comments
|
Download
|
|
M |
content/content_browser.gypi
|
View
|
1
2
3
4
5
6
|
2 chunks |
+11 lines, -3 lines |
0 comments
|
Download
|
|
A |
content/content_jni.gypi
|
View
|
1
2
3
4
5
6
|
1 chunk |
+27 lines, -0 lines |
0 comments
|
Download
|
|
M |
content/content_shell.gypi
|
View
|
1
|
2 chunks |
+16 lines, -2 lines |
0 comments
|
Download
|
|
M |
content/plugin/webplugin_proxy.cc
|
View
|
|
1 chunk |
+10 lines, -0 lines |
0 comments
|
Download
|
|
M |
content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc
|
View
|
1
|
2 chunks |
+21 lines, -0 lines |
0 comments
|
Download
|
|
M |
content/public/android/java/content.xml
|
View
|
1
2
3
4
5
6
|
2 chunks |
+3 lines, -5 lines |
0 comments
|
Download
|
|
A |
content/public/android/java/org/chromium/content/browser/CommandLine.java
|
View
|
1
2
3
|
1 chunk |
+467 lines, -0 lines |
0 comments
|
Download
|
|
A |
content/public/android/java/org/chromium/content/browser/JNIHelper.java
|
View
|
1
|
1 chunk |
+71 lines, -0 lines |
0 comments
|
Download
|
|
A |
content/public/android/java/org/chromium/content/browser/LibraryLoader.java
|
View
|
1
|
1 chunk |
+239 lines, -0 lines |
0 comments
|
Download
|
|
A |
content/public/android/java/org/chromium/content/browser/TraceEvent.java
|
View
|
1
|
1 chunk |
+143 lines, -0 lines |
0 comments
|
Download
|
|
M |
content/shell/android/content_shell_apk.xml
|
View
|
1
|
1 chunk |
+7 lines, -0 lines |
0 comments
|
Download
|
|
M |
content/shell/android/java/org/chromium/content_shell/ContentShellActivity.java
|
View
|
1
|
4 chunks |
+11 lines, -21 lines |
0 comments
|
Download
|
|
M |
content/shell/android/java/org/chromium/content_shell/ContentShellApplication.java
|
View
|
1
|
1 chunk |
+7 lines, -1 line |
0 comments
|
Download
|
|
M |
content/shell/android/shell_library_loader.cc
|
View
|
1
2
|
3 chunks |
+34 lines, -4 lines |
0 comments
|
Download
|
|
M |
media/base/android/java/media.xml
|
View
|
1
|
3 chunks |
+11 lines, -7 lines |
0 comments
|
Download
|
|
M |
media/media.gyp
|
View
|
1
2
3
4
5
6
7
|
2 chunks |
+12 lines, -0 lines |
0 comments
|
Download
|
|
M |
net/android/java/net.xml
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
Total messages: 22 (0 generated)
|