]> granicus.if.org Git - libvpx/commitdiff
build/make/Android.mk: set/use qexec appropriately
authorJames Zern <jzern@google.com>
Thu, 24 Nov 2016 00:46:50 +0000 (16:46 -0800)
committerJames Zern <jzern@google.com>
Thu, 24 Nov 2016 00:46:50 +0000 (16:46 -0800)
commands are echo'd when V=1; libs.mk depends on this variable as well

Change-Id: I88f91b9260f16686cfccdf6bd3f29d246521b62e

build/make/Android.mk

index 6d96244e0fa32e01979cd74a43b77eb12843a026..8c83e7222bd768d71f10003d65f033d566d86036 100644 (file)
@@ -64,6 +64,9 @@ CONFIG_DIR := $(LOCAL_PATH)/
 LIBVPX_PATH := $(LOCAL_PATH)/libvpx
 ASM_CNV_PATH_LOCAL := $(TARGET_ARCH_ABI)/ads2gas
 ASM_CNV_PATH := $(LOCAL_PATH)/$(ASM_CNV_PATH_LOCAL)
+ifneq ($(V),1)
+  qexec := @
+endif
 
 # Use the makefiles generated by upstream configure to determine which files to
 # build. Also set any architecture-specific flags.
@@ -103,8 +106,8 @@ LOCAL_ASMFLAGS := -I$(LIBVPX_PATH)
 
 .PRECIOUS: %.asm.S
 $(ASM_CNV_PATH)/libvpx/%.asm.S: $(LIBVPX_PATH)/%.asm
-       @mkdir -p $(dir $@)
-       @$(CONFIG_DIR)$(ASM_CONVERSION) <$< > $@
+       $(qexec)mkdir -p $(dir $@)
+       $(qexec)$(CONFIG_DIR)$(ASM_CONVERSION) <$< > $@
 
 # For building *_rtcd.h, which have rules in libs.mk
 TGT_ISA:=$(word 1, $(subst -, ,$(TOOLCHAIN)))
@@ -197,9 +200,9 @@ $(eval $(call rtcd_dep_template))
 .PHONY: clean
 clean:
        @echo "Clean: ads2gas files [$(TARGET_ARCH_ABI)]"
-       @$(RM) $(CODEC_SRCS_ASM_ADS2GAS) $(CODEC_SRCS_ASM_NEON_ADS2GAS)
-       @$(RM) -r $(ASM_CNV_PATH)
-       @$(RM) $(CLEAN-OBJS)
+       $(qexec)$(RM) $(CODEC_SRCS_ASM_ADS2GAS) $(CODEC_SRCS_ASM_NEON_ADS2GAS)
+       $(qexec)$(RM) -r $(ASM_CNV_PATH)
+       $(qexec)$(RM) $(CLEAN-OBJS)
 
 ifeq ($(ENABLE_SHARED),1)
   LOCAL_CFLAGS += -fPIC