aboutsummaryrefslogtreecommitdiffstats
path: root/monitor
diff options
context:
space:
mode:
authorRaphael Moll <ralf@android.com>2012-09-05 11:15:56 -0700
committerRaphael Moll <ralf@android.com>2012-09-05 11:36:33 -0700
commit91ef059121f42626cf6273681cd72403846ac795 (patch)
treeb715404691498fa8b5dd7b900df0182b3d9bdcc0 /monitor
parent8f569b2594013c3f67c82d989bddbf5b3ada5d01 (diff)
downloadsdk-91ef059121f42626cf6273681cd72403846ac795.zip
sdk-91ef059121f42626cf6273681cd72403846ac795.tar.gz
sdk-91ef059121f42626cf6273681cd72403846ac795.tar.bz2
SDK: fix sed filter in monitor makefile.
Fix the sed filter so that it work on MacOS. Change-Id: I920e5e713bd48c47c9b9c99ba52be64bcefaa69c
Diffstat (limited to 'monitor')
-rw-r--r--monitor/Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/monitor/Android.mk b/monitor/Android.mk
index fbf5a6d..d1dcfb5 100644
--- a/monitor/Android.mk
+++ b/monitor/Android.mk
@@ -42,7 +42,7 @@ $(LOCAL_BUILT_MODULE) : $(TOPDIR)sdk/monitor/monitor \
-DbuildFor=$(HOST_OS) 2>&1 && \
mv -f ../../$(RCP_LOG_FILE) ../../$(RCP_LOG_FILE).1 ) \
| tee ../../$(RCP_LOG_FILE) \
- | sed '/SUCCESSFUL/d ; /\[java\]/!b label; s/\s\+\[java\]//; /^\s*$$/d; /Compiling/!d; :label /^\s*$$/d; s/^/monitor: /'; \
+ | sed -E '/\[java\]/!d; /SUCCESSFUL/d ; s/^ +\[java\] //; /^ *$$/d; /:$$/d; /\[javac\] [^C]/d; s/^/monitor: /'; \
if [[ -f ../../$(RCP_LOG_FILE) ]]; then \
echo "Monitor failed. Full log:" ; \
cat ../../$(RCP_LOG_FILE) ; \