commit d8c0d8dcbd562e8facb5aa584ed5ddca96e790c1
author The Android Automerger <android-build@android.com> Mon Apr 15 05:56:35 2013 -0700
committer The Android Automerger <android-build@android.com> Mon Apr 15 05:56:35 2013 -0700
tree 0bc8516f92d7d02982a0d646944bb3206e389d24
parent 24bc41b78ca004ac7a6873054ff919da1ba9a6f8
parent 2c61db947a260b50a3950b15cd56e5fa9ce15457

merge in jb-mr2-release history after reset to jb-mr2-dev

include/cutils/trace.h

diff --git a/include/cutils/trace.h b/include/cutils/trace.h
index 55aabdd..15f8fb9 100644
--- a/include/cutils/trace.h
+++ b/include/cutils/trace.h
@@ -64,7 +64,8 @@
 #define ATRACE_TAG_CAMERA           (1<<10)
 #define ATRACE_TAG_HAL              (1<<11)
 #define ATRACE_TAG_APP              (1<<12)
-#define ATRACE_TAG_LAST             ATRACE_TAG_APP
+#define ATRACE_TAG_RESOURCES        (1<<13)
+#define ATRACE_TAG_LAST             ATRACE_TAG_RESOURCES
 
 // Reserved for initialization.
 #define ATRACE_TAG_NOT_READY        (1LL<<63)

libcutils/Android.mk

diff --git a/libcutils/Android.mk b/libcutils/Android.mk
index 7931684..4056e8a 100644
--- a/libcutils/Android.mk
+++ b/libcutils/Android.mk
@@ -142,7 +142,9 @@
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := libcutils
-LOCAL_WHOLE_STATIC_LIBRARIES := libcutils
+# TODO: remove liblog as whole static library, once we don't have prebuilt that requires
+# liblog symbols present in libcutils.
+LOCAL_WHOLE_STATIC_LIBRARIES := libcutils liblog
 LOCAL_SHARED_LIBRARIES := liblog
 LOCAL_CFLAGS += $(targetSmpFlag)
 LOCAL_C_INCLUDES := $(libcutils_c_includes)