aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZi Lin <lziest@google.com>2022-02-16 00:29:18 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-02-16 00:29:18 +0000
commitfbdbf7d44be6d7488fa91c66a36440e735c4d11d (patch)
treeaafa68f31c18627726261f3af23594488e94aaba
parent16452228033eac506b918e07dd125646651ef327 (diff)
parent138761fdcc8c2c074bef7700e39b47b44cc5bcc0 (diff)
downloadminijail-fbdbf7d44be6d7488fa91c66a36440e735c4d11d.tar.gz
Makefile: revert the usage of $(ECHO) temporarily. am: 138761fdcc
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1978848 Change-Id: Ic024482e62ed714ee8134a8a9eb92b482a701956
-rw-r--r--Makefile7
1 files changed, 3 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 2194255..f44f867 100644
--- a/Makefile
+++ b/Makefile
@@ -95,8 +95,7 @@ tests: TEST(CXX_BINARY(libminijail_unittest)) \
TEST(CXX_BINARY(syscall_filter_unittest)) \
TEST(CXX_BINARY(system_unittest)) \
TEST(CXX_BINARY(util_unittest)) \
- TEST(CXX_BINARY(config_parser_unittest)) \
-
+ TEST(CXX_BINARY(config_parser_unittest))
CC_BINARY(minijail0): LDLIBS += -lcap -ldl
CC_BINARY(minijail0): $(CORE_OBJECT_FILES) \
@@ -185,7 +184,7 @@ libsyscalls.gen.o.depends: libsyscalls.gen.c
# Only regenerate libsyscalls.gen.c if the Makefile or header changes.
# NOTE! This will not detect if the file is not appropriate for the target.
libsyscalls.gen.c: $(SRC)/libsyscalls.h $(SRC)/Makefile
- @$(ECHO) "GEN $(subst $(SRC)/,,$<) -> $@"
+ @/bin/echo -e "GEN $(subst $(SRC)/,,$<) -> $@"
$(QUIET)CC="$(CC)" $(SRC)/gen_syscalls.sh "$@"
clean: CLEAN(libsyscalls.gen.c)
@@ -198,7 +197,7 @@ libconstants.gen.o.depends: libconstants.gen.c
# Only regenerate libconstants.gen.c if the Makefile or header changes.
# NOTE! This will not detect if the file is not appropriate for the target.
libconstants.gen.c: $(SRC)/libconstants.h $(SRC)/Makefile
- @$(ECHO) "GEN $(subst $(SRC)/,,$<) -> $@"
+ @/bin/echo -e "GEN $(subst $(SRC)/,,$<) -> $@"
$(QUIET)CC="$(CC)" $(SRC)/gen_constants.sh "$@"
clean: CLEAN(libconstants.gen.c)