diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-01-28 21:09:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-01-28 21:09:37 +0000 |
| commit | d2acdd82e613b3e1d79a00943ac3bf5fbc14a766 (patch) | |
| tree | d7f0ff36ad86281f3fa4eb36978658711e7c2296 /logcat/Android.mk | |
| parent | 12db3eb6db3b80011043e404530012612a1d0fbf (diff) | |
| parent | 44b99c22af84331068935a9bc3e807165a88237c (diff) | |
| download | system_core-d2acdd82e613b3e1d79a00943ac3bf5fbc14a766.zip system_core-d2acdd82e613b3e1d79a00943ac3bf5fbc14a766.tar.gz system_core-d2acdd82e613b3e1d79a00943ac3bf5fbc14a766.tar.bz2 | |
Merge changes I70ab37d5,I716f89c0,I34c96adf,I77650923,I35b0d1ee, ...
* changes:
libsysutils: SocketListener export release
libsysutils: Add iovec/runOnEachSocket
liblog: support struct logger_event_v2 format
liblog: update timestamp on NOTICE file
libcutils: resolve warning in iosched_policy.c
liblog: Add const pedantics
logcat: Add -T flag (-t w/o assumption of -d)
logcat: Add logcat test suite
liblog: Add cpu utilization test
liblog: Add liblog test suite
debuggerd: Support newline split in log messages
liblog: deprecate export LOGGER ioctl definitions
liblog: deprecate export of LOGGER_LOG_* defines
liblog: Add README
liblog: resolve build warning messages
liblog: high CPU usage from logcat
liblog: fix build again
liblog: drop use of sys/cdefs.h
liblog: git_master@964770 build problem
logcat: Incorporate liblog reading API
debuggerd: Incorporate liblog reading API
liblog: Interface to support abstracting log read
adb: deprecate legacy log service interface
adb: regression from Move list.c to inlines
liblog: whitespace cleanup
libcutils: bug str_parms.c:str_parms_get_float().
libcutils: UNUSED argument warnings
libsysutils: Get rid of warnings
libcutils: Move list.c to inlines on list.h
Diffstat (limited to 'logcat/Android.mk')
| -rw-r--r-- | logcat/Android.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/logcat/Android.mk b/logcat/Android.mk index 7b8eb01..b5e27eb 100644 --- a/logcat/Android.mk +++ b/logcat/Android.mk @@ -1,4 +1,4 @@ -# Copyright 2006 The Android Open Source Project +# Copyright 2006-2014 The Android Open Source Project LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) @@ -10,3 +10,5 @@ LOCAL_SHARED_LIBRARIES := liblog LOCAL_MODULE:= logcat include $(BUILD_EXECUTABLE) + +include $(call first-makefiles-under,$(LOCAL_PATH)) |