summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJose Fonseca <jfonseca@vmware.com>2016-01-07 16:11:38 +0000
committerJose Fonseca <jfonseca@vmware.com>2016-01-07 16:12:30 +0000
commit71a33a59fe2c36c092effb35aceb2ba7930cf90b (patch)
tree1fa4f64c3a6af482fe57c5373709ef475a1dbdee /docs
parent5e96ed318db1ba8037eb402724bc052240ac9e05 (diff)
docs: Rename Dalvik -> Android.
As it seems Dalvik use has been discontinued. [ci skip]
Diffstat (limited to 'docs')
-rw-r--r--docs/Android.markdown (renamed from docs/Dalvik.markdown)6
-rw-r--r--docs/NEWS.markdown2
-rw-r--r--docs/USAGE.markdown2
3 files changed, 5 insertions, 5 deletions
diff --git a/docs/Dalvik.markdown b/docs/Android.markdown
index 6f3bb244..23064b83 100644
--- a/docs/Dalvik.markdown
+++ b/docs/Android.markdown
@@ -1,6 +1,6 @@
-# Tracing Dalvik VM (Java) applications on Android #
+# Tracing Java applications on Android #
-Android's Java virtual machine, Dalvik, runs as a system service (started at
+Android's Java virtual machine, runs as a system service (started at
bootup by `init`) and Java applications are run by forks of the initial
resident process. Thus, injecting apitrace's tracing library is different from
other operating systems.
@@ -12,7 +12,7 @@ The following discussion assumes that tracing library is copied to `/data`:
## Tracing on Android 4.0 and newer ##
-Starting from Android 4.0 (Ice Cream Sandwich) release, Dalvik supports
+Starting from Android 4.0 (Ice Cream Sandwich) release, the system supports
running designated processes with wrappers, in which case a new Java VM is
started with 'system()' library call for that process.
diff --git a/docs/NEWS.markdown b/docs/NEWS.markdown
index 0eacda3c..003eb3d1 100644
--- a/docs/NEWS.markdown
+++ b/docs/NEWS.markdown
@@ -39,7 +39,7 @@ and their authors see the git history.
# Version 4 #
-* Support tracing in Android, both native and Dalvik applications
+* Support tracing in Android, both native and Java applications
* Show frame thumbnails in the GUI
diff --git a/docs/USAGE.markdown b/docs/USAGE.markdown
index eb4a8729..4edb6565 100644
--- a/docs/USAGE.markdown
+++ b/docs/USAGE.markdown
@@ -141,7 +141,7 @@ See the `ld.so` man page for more information about `LD_PRELOAD` and
To trace standalone native OpenGL ES applications, use
`LD_PRELOAD=/path/to/egltrace.so /path/to/application` as described in the
-previous section. To trace Java applications, refer to Dalvik.markdown.
+previous section. To trace Java applications, refer to Android.markdown.
### Mac OS X ###