diff options
| author | Elliott Hughes <enh@google.com> | 2014-05-28 21:41:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-28 21:41:25 +0000 |
| commit | c752d6dd37a943b2ef64c184a0ff542e78173bc9 (patch) | |
| tree | 10325c18a7b1916331cdefc70bd1bce3f32d7e91 | |
| parent | 6445b40e93931dedcb831f38343c031c13b7ddb2 (diff) | |
| parent | bf082ffb71c40e4670410b246309a182d9dafcf5 (diff) | |
| download | system_core-c752d6dd37a943b2ef64c184a0ff542e78173bc9.zip system_core-c752d6dd37a943b2ef64c184a0ff542e78173bc9.tar.gz system_core-c752d6dd37a943b2ef64c184a0ff542e78173bc9.tar.bz2 | |
am bf082ffb: Merge "Updated trace.h to recognize ATRACE_TAG_BIONIC."
* commit 'bf082ffb71c40e4670410b246309a182d9dafcf5':
Updated trace.h to recognize ATRACE_TAG_BIONIC.
| -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) |