diff options
| author | Doug Zongker <dougz@android.com> | 2009-12-03 17:05:42 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-03 17:05:42 -0800 |
| commit | 73bec02cc3c5e4598c5a4c56cf7843b5a24af31d (patch) | |
| tree | 028ddff36d14450e738fc7c8ff7811f6e8be84be | |
| parent | f95837a1e13c9b63bfe0b0f95f00ec0d72ba2e74 (diff) | |
| parent | 7fa286662790bce1687bd4ff25a6735491392b9c (diff) | |
| download | system_core-73bec02cc3c5e4598c5a4c56cf7843b5a24af31d.tar.gz system_core-73bec02cc3c5e4598c5a4c56cf7843b5a24af31d.tar.bz2 system_core-73bec02cc3c5e4598c5a4c56cf7843b5a24af31d.zip | |
am 7fa28666: Merge change I502d5a9b into eclair-mr2
Merge commit '7fa286662790bce1687bd4ff25a6735491392b9c' into eclair-mr2-plus-aosp
* commit '7fa286662790bce1687bd4ff25a6735491392b9c':
construct event-log-tags via the new build mechanism
| -rw-r--r-- | logcat/Android.mk | 16 | ||||
| -rw-r--r-- | logcat/event.logtags (renamed from logcat/event-log-tags) | 0 |
2 files changed, 1 insertions, 15 deletions
diff --git a/logcat/Android.mk b/logcat/Android.mk index 5a9f12da..7b8eb01e 100644 --- a/logcat/Android.mk +++ b/logcat/Android.mk @@ -3,24 +3,10 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_SRC_FILES:= logcat.cpp +LOCAL_SRC_FILES:= logcat.cpp event.logtags LOCAL_SHARED_LIBRARIES := liblog LOCAL_MODULE:= logcat include $(BUILD_EXECUTABLE) - -######################## -include $(CLEAR_VARS) - -LOCAL_MODULE := event-log-tags - -# This will install the file in /system/etc -# -LOCAL_MODULE_CLASS := ETC - -LOCAL_SRC_FILES := $(LOCAL_MODULE) -LOCAL_PREBUILT_STRIP_COMMENTS := 1 - -include $(BUILD_PREBUILT) diff --git a/logcat/event-log-tags b/logcat/event.logtags index a51e2fa4..a51e2fa4 100644 --- a/logcat/event-log-tags +++ b/logcat/event.logtags |