diff options
| author | Elliott Hughes <enh@google.com> | 2014-05-29 01:08:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-29 01:08:06 +0000 |
| commit | 3e54077d429e983ec9c4c7eaef561587eef4d49c (patch) | |
| tree | 5c0af6240d63bf13a05f86c2572038e95ef45366 | |
| parent | 4b0af48a216180d6d21a2a6225308e6ad6a8d2e1 (diff) | |
| parent | e77cb9317de54ea0041eeef7966b818257158f64 (diff) | |
| download | frameworks_native-3e54077d429e983ec9c4c7eaef561587eef4d49c.zip frameworks_native-3e54077d429e983ec9c4c7eaef561587eef4d49c.tar.gz frameworks_native-3e54077d429e983ec9c4c7eaef561587eef4d49c.tar.bz2 | |
am e77cb931: am 259c2508: am 03e2f8fa: Merge "Modified atrace.cpp to recognize ATRACE_TAG_BIONIC."
* commit 'e77cb9317de54ea0041eeef7966b818257158f64':
Modified atrace.cpp to recognize ATRACE_TAG_BIONIC.
| -rw-r--r-- | cmds/atrace/atrace.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp index 099c3df..0d71bbd 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" }, |