diff options
author | Zi Lin <lziest@google.com> | 2022-02-16 01:01:42 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-02-16 01:01:42 +0000 |
commit | 0b13ce227dd54c3f01953430ad08f310b9a4f8f4 (patch) | |
tree | aafa68f31c18627726261f3af23594488e94aaba | |
parent | 892399dd800429492fd1ceebf6a50ebc40bb4684 (diff) | |
parent | 43529d8d29121f9034cfb3104d07bbfc908ce36e (diff) | |
download | minijail-0b13ce227dd54c3f01953430ad08f310b9a4f8f4.tar.gz |
Makefile: revert the usage of $(ECHO) temporarily. am: 138761fdcc am: fbdbf7d44b am: 43529d8d29
Original change: https://android-review.googlesource.com/c/platform/external/minijail/+/1978848
Change-Id: I44175f5683f06fae8820a12c37d3451ce731b781
-rw-r--r-- | Makefile | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -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) |