diff options
author | Elliott Hughes <enh@google.com> | 2014-05-28 21:45:12 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-28 21:45:12 +0000 |
commit | b3697ec2cb75d4f13c22a54b0ef90f4e8fb46e02 (patch) | |
tree | 5aa861e56f6d2f5064ea08a774bb1a5f4b168aa3 /include | |
parent | 27348af683a55d8701567fdeabdd37b547b187f0 (diff) | |
parent | c752d6dd37a943b2ef64c184a0ff542e78173bc9 (diff) | |
download | system_core-b3697ec2cb75d4f13c22a54b0ef90f4e8fb46e02.zip system_core-b3697ec2cb75d4f13c22a54b0ef90f4e8fb46e02.tar.gz system_core-b3697ec2cb75d4f13c22a54b0ef90f4e8fb46e02.tar.bz2 |
am c752d6dd: am bf082ffb: Merge "Updated trace.h to recognize ATRACE_TAG_BIONIC."
* commit 'c752d6dd37a943b2ef64c184a0ff542e78173bc9':
Updated trace.h to recognize ATRACE_TAG_BIONIC.
Diffstat (limited to 'include')
-rw-r--r-- | include/cutils/trace.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/cutils/trace.h b/include/cutils/trace.h index 3f49e8c..fd9bc6a 100644 --- a/include/cutils/trace.h +++ b/include/cutils/trace.h @@ -69,7 +69,8 @@ __BEGIN_DECLS #define ATRACE_TAG_RESOURCES (1<<13) #define ATRACE_TAG_DALVIK (1<<14) #define ATRACE_TAG_RS (1<<15) -#define ATRACE_TAG_LAST ATRACE_TAG_RS +#define ATRACE_TAG_BIONIC (1<<16) +#define ATRACE_TAG_LAST ATRACE_TAG_BIONIC // Reserved for initialization. #define ATRACE_TAG_NOT_READY (1LL<<63) |