diff options
| author | Elliott Hughes <enh@google.com> | 2014-05-28 22:17:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-28 22:17:56 +0000 |
| commit | 540a1849cb30a37f070fb7f252f5221ba41a0d4f (patch) | |
| tree | cf2e9ba532bec408f7e0735c69b9e9b4224aa44d /include/cutils | |
| parent | 1142d8eceae962d481d922358ebe9837ba975a2a (diff) | |
| parent | b3697ec2cb75d4f13c22a54b0ef90f4e8fb46e02 (diff) | |
| download | system_core-540a1849cb30a37f070fb7f252f5221ba41a0d4f.zip system_core-540a1849cb30a37f070fb7f252f5221ba41a0d4f.tar.gz system_core-540a1849cb30a37f070fb7f252f5221ba41a0d4f.tar.bz2 | |
am b3697ec2: am c752d6dd: am bf082ffb: Merge "Updated trace.h to recognize ATRACE_TAG_BIONIC."
* commit 'b3697ec2cb75d4f13c22a54b0ef90f4e8fb46e02':
Updated trace.h to recognize ATRACE_TAG_BIONIC.
Diffstat (limited to 'include/cutils')
| -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) |