summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-05-29 01:02:16 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-29 01:02:16 +0000
commit259c25080d8b7f3b66e27e4d8ac3a268738ebe3f (patch)
tree919c2679f2ee6dcc248382d842409ffbdd7901ab
parente67810fd7a00ffa92337c6f3aa6114136ce12613 (diff)
parent03e2f8fa13a791d744758ec9ffe27f52cab730d0 (diff)
downloadnative-259c25080d8b7f3b66e27e4d8ac3a268738ebe3f.tar.gz
am 03e2f8fa: Merge "Modified atrace.cpp to recognize ATRACE_TAG_BIONIC."
* commit '03e2f8fa13a791d744758ec9ffe27f52cab730d0': Modified atrace.cpp to recognize ATRACE_TAG_BIONIC.
-rw-r--r--cmds/atrace/atrace.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp
index 34dc9fef8d..3461e3877c 100644
--- a/cmds/atrace/atrace.cpp
+++ b/cmds/atrace/atrace.cpp
@@ -84,6 +84,7 @@ static const TracingCategory k_categories[] = {
{ "res", "Resource Loading", ATRACE_TAG_RESOURCES, { } },
{ "dalvik", "Dalvik VM", ATRACE_TAG_DALVIK, { } },
{ "rs", "RenderScript", ATRACE_TAG_RS, { } },
+ { "bionic", "Bionic C Library", ATRACE_TAG_BIONIC, { } },
{ "sched", "CPU Scheduling", 0, {
{ REQ, "/sys/kernel/debug/tracing/events/sched/sched_switch/enable" },
{ REQ, "/sys/kernel/debug/tracing/events/sched/sched_wakeup/enable" },