summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--core/Makefile57
-rw-r--r--core/base_rules.mk8
-rw-r--r--core/binary.mk4
-rw-r--r--core/cleanbuild.mk4
-rw-r--r--core/combo/HOST_darwin-x86.mk2
-rw-r--r--core/definitions.mk70
-rw-r--r--core/dex_preopt.mk2
-rw-r--r--core/distdir.mk2
-rw-r--r--core/droiddoc.mk6
-rw-r--r--core/dynamic_binary.mk8
-rw-r--r--core/host_java_library.mk8
-rw-r--r--core/java.mk12
-rw-r--r--core/java_library.mk6
-rw-r--r--core/main.mk6
-rw-r--r--core/notice_files.mk2
-rw-r--r--core/package.mk6
-rw-r--r--core/pdk_config.mk2
-rw-r--r--core/raw_executable.mk2
-rw-r--r--core/static_java_library.mk2
-rw-r--r--core/tasks/apicheck.mk4
-rw-r--r--core/tasks/collect_gpl_sources.mk2
-rw-r--r--core/tasks/product-graph.mk4
-rw-r--r--core/tasks/sdk-addon.mk2
-rw-r--r--tools/apicheck/Android.mk2
24 files changed, 112 insertions, 111 deletions
diff --git a/core/Makefile b/core/Makefile
index aac74eb..3b89c6f 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1,13 +1,14 @@
# Put some miscellaneous rules here
# Build system colors
-#
-# PFX: Prefix "target C++:" in yellow
-# INS: Module "Install:" output color (cyan for ics)
ifneq ($(BUILD_WITH_COLORS),0)
- CL_PFX="\033[33m"
- CL_INS="\033[36m"
+ CL_RED="\033[31m"
+ CL_GRN="\033[32m"
+ CL_YLW="\033[33m"
+ CL_BLU="\033[34m"
+ CL_MAG="\033[35m"
+ CL_CYN="\033[36m"
CL_RST="\033[0m"
endif
@@ -419,7 +420,7 @@ INTERNAL_BOOTIMAGE_ARGS += --genext2fs $(MKEXT2IMG)
$(INSTALLED_BOOTIMAGE_TARGET): $(MKEXT2IMG) $(INTERNAL_BOOTIMAGE_FILES)
$(call pretty,"Target boot image: $@")
$(hide) $(MKEXT2BOOTIMG) $(INTERNAL_BOOTIMAGE_ARGS) --output $@
- @echo -e ${CL_INS}"Made boot image: $@"${CL_RST}
+ @echo -e ${CL_CYN}"Made boot image: $@"${CL_RST}
else ifndef BOARD_CUSTOM_BOOTIMG_MK # TARGET_BOOTIMAGE_USE_EXT2 != true
@@ -427,7 +428,7 @@ $(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_FILES)
$(call pretty,"Target boot image: $@")
$(hide) $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_ARGS) --output $@
$(hide) $(call assert-max-image-size,$@,$(BOARD_BOOTIMAGE_PARTITION_SIZE),raw)
- @echo -e ${CL_INS}"Made boot image: $@"${CL_RST}
+ @echo -e ${CL_CYN}"Made boot image: $@"${CL_RST}
endif # ifndef BOARD_CUSTOM_BOOTIMG_MK
@@ -531,7 +532,7 @@ endif
$(kernel_notice_file): \
prebuilts/qemu-kernel/arm/LINUX_KERNEL_COPYING \
| $(ACP)
- @echo Copying: $@
+ @echo -e ${CL_CYN}"Copying:"${CL_RST}" $@"
$(hide) mkdir -p $(dir $@)
$(hide) $(ACP) $< $@
@@ -704,15 +705,15 @@ $(TARGET_RECOVERY_ROOT_TIMESTAMP): $(INTERNAL_RECOVERY_FILES) \
$(recovery_build_prop) $(recovery_resource_deps) \
$(recovery_fstab) \
$(RECOVERY_INSTALL_OTA_KEYS)
- @echo "----- Making recovery filesystem ------"
+ @echo -e ${CL_CYN}"----- Making recovery filesystem ------"${CL_RST}
mkdir -p $(TARGET_RECOVERY_OUT)
mkdir -p $(TARGET_RECOVERY_ROOT_OUT)
mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/etc
mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/tmp
- @echo Copying baseline ramdisk...
+ @echo -e ${CL_CYN}"Copying baseline ramdisk..."${CL_RST}
cp -R $(TARGET_ROOT_OUT) $(TARGET_RECOVERY_OUT)
rm $(TARGET_RECOVERY_ROOT_OUT)/init*.rc
- @echo Modifying ramdisk contents...
+ @echo -e ${CL_CYN}"Modifying ramdisk contents..."${CL_RST}
cp -f $(recovery_initrc) $(TARGET_RECOVERY_ROOT_OUT)/init.rc
cp -f $(recovery_binary) $(TARGET_RECOVERY_ROOT_OUT)/sbin/
rm -f $(TARGET_RECOVERY_ROOT_OUT)/init.*.rc
@@ -727,28 +728,28 @@ $(TARGET_RECOVERY_ROOT_TIMESTAMP): $(INTERNAL_RECOVERY_FILES) \
cp $(RECOVERY_INSTALL_OTA_KEYS) $(TARGET_RECOVERY_ROOT_OUT)/res/keys
cat $(INSTALLED_DEFAULT_PROP_TARGET) $(recovery_build_prop) \
> $(TARGET_RECOVERY_ROOT_OUT)/default.prop
- @echo Modifying default.prop
+ @echo -e ${CL_YLW}"Modifying default.prop"${CL_RST}
sed -i 's/ro.build.date.utc=.*/ro.build.date.utc=0/g' $(TARGET_RECOVERY_ROOT_OUT)/default.prop
- @echo "----- Made recovery filesystem --------" $(TARGET_RECOVERY_ROOT_OUT)
+ @echo -e ${CL_CYN}"----- Made recovery filesystem --------"$(TARGET_RECOVERY_ROOT_OUT)${CL_RST}
@touch $(TARGET_RECOVERY_ROOT_TIMESTAMP)
$(recovery_uncompressed_ramdisk): $(MINIGZIP) \
$(TARGET_RECOVERY_ROOT_TIMESTAMP)
- @echo "----- Making uncompressed recovery ramdisk ------"
+ @echo -e ${CL_CYN}"----- Making uncompressed recovery ramdisk ------"${CL_RST}
$(MKBOOTFS) $(TARGET_RECOVERY_ROOT_OUT) > $@
$(recovery_ramdisk): $(MKBOOTFS) \
$(recovery_uncompressed_ramdisk)
- @echo "----- Making recovery ramdisk ------"
+ @echo -e ${CL_CYN}"----- Making recovery ramdisk ------"${CL_RST}
$(MINIGZIP) < $(recovery_uncompressed_ramdisk) > $@
ifndef BOARD_CUSTOM_BOOTIMG_MK
$(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTIMG) \
$(recovery_ramdisk) \
$(recovery_kernel)
- @echo "----- Making recovery image ------"
+ @echo -e ${CL_CYN}"----- Making recovery image ------"${CL_RST}
$(MKBOOTIMG) $(INTERNAL_RECOVERYIMAGE_ARGS) --output $@
- @echo -e ${CL_INS}"Made recovery image: $@"${CL_RST}
+ @echo -e ${CL_CYN}"Made recovery image: $@"${CL_RST}
$(hide) $(call assert-max-image-size,$@,$(BOARD_RECOVERYIMAGE_PARTITION_SIZE),raw)
endif
@@ -761,7 +762,7 @@ recoveryimage: $(INSTALLED_RECOVERYIMAGE_TARGET)
INSTALLED_RECOVERYZIP_TARGET := $(PRODUCT_OUT)/utilities/update.zip
$(INSTALLED_RECOVERYZIP_TARGET): $(INSTALLED_RECOVERYIMAGE_TARGET) $(TARGET_OUT)/bin/updater $(HOST_OUT_JAVA_LIBRARIES)/signapk.jar
- @echo -e ${CL_PFX}"----- Making recovery zip -----"${CL_RST}
+ @echo -e ${CL_CYN}"----- Making recovery zip -----"${CL_RST}
./build/tools/device/mkrecoveryzip.sh $(PRODUCT_OUT) $(HOST_OUT_JAVA_LIBRARIES)/signapk.jar
.PHONY: recoveryzip
@@ -866,14 +867,14 @@ $(RECOVERY_FROM_BOOT_PATCH): $(INSTALLED_RECOVERYIMAGE_TARGET) \
$(INSTALLED_BOOTIMAGE_TARGET) \
$(HOST_OUT_EXECUTABLES)/imgdiff \
$(HOST_OUT_EXECUTABLES)/bsdiff
- @echo "Construct recovery from boot"
+ @echo -e ${CL_CYN}"Construct recovery from boot"${CL_RST}
mkdir -p $(dir $@)
PATH=$(HOST_OUT_EXECUTABLES):$$PATH $(HOST_OUT_EXECUTABLES)/imgdiff $(INSTALLED_BOOTIMAGE_TARGET) $(INSTALLED_RECOVERYIMAGE_TARGET) $@
endif
$(INSTALLED_SYSTEMIMAGE): $(BUILT_SYSTEMIMAGE) $(RECOVERY_FROM_BOOT_PATCH) | $(ACP)
- @echo -e ${CL_INS}"Install system fs image: $@"${CL_RST}
+ @echo -e ${CL_CYN}"Install system fs image: $@"${CL_RST}
$(copy-file-to-target)
$(hide) $(call assert-max-image-size,$@ $(RECOVERY_FROM_BOOT_PATCH),$(BOARD_SYSTEMIMAGE_PARTITION_SIZE),yaffs)
@@ -1154,7 +1155,7 @@ $(BUILT_TARGET_FILES_PACKAGE): \
$(APKCERTS_FILE) \
$(HOST_OUT_EXECUTABLES)/fs_config \
| $(ACP)
- @echo -e ${CL_PFX}"Package target files:"${CL_RST}" $@"
+ @echo -e ${CL_YLW}"Package target files:"${CL_RST}" $@"
$(hide) rm -rf $@ $(zip_root)
$(hide) mkdir -p $(dir $@) $(zip_root)
@# Components of the recovery image
@@ -1300,7 +1301,7 @@ else
endif
$(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS) $(SELINUX_DEPENDS)
- @echo -e ${CL_PFX}"Package OTA:"${CL_RST}" $@"
+ @echo -e ${CL_YLW}"Package OTA:"${CL_RST}" $@"
$(OTA_FROM_TARGET_SCRIPT) -v \
-p $(HOST_OUT) \
-k $(KEY_CERT_PAIR) \
@@ -1312,10 +1313,10 @@ $(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS) $(SEL
otapackage: $(INTERNAL_OTA_PACKAGE_TARGET)
bacon: otapackage
ifneq ($(TARGET_CUSTOM_RELEASETOOL),)
- @echo "Running custom releasetool..."
+ @echo -e ${CL_YLW}"Running custom releasetool..."${CL_RST}
$(hide) OTAPACKAGE=$(INTERNAL_OTA_PACKAGE_TARGET) APKCERTS=$(APKCERTS_FILE) $(TARGET_CUSTOM_RELEASETOOL)
else
- @echo "Running releasetool..."
+ @echo -e ${CL_YLW}"Running releasetool..."${CL_RST}
$(hide) OTAPACKAGE=$(INTERNAL_OTA_PACKAGE_TARGET) APKCERTS=$(APKCERTS_FILE) ./vendor/cm/tools/squisher
endif
@@ -1344,7 +1345,7 @@ else
endif
$(INTERNAL_UPDATE_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS) $(SELINUX_DEPENDS)
- @echo -e ${CL_PFX}"Package:"${CL_RST}" $@"
+ @echo -e ${CL_YLW}"Package:"${CL_RST}" $@"
$(IMG_FROM_TARGET_SCRIPT) -v \
-s $(extensions) \
-p $(HOST_OUT) \
@@ -1379,7 +1380,7 @@ $(BUILT_TESTS_ZIP_PACKAGE): zip_root := $(intermediates)/$(name)
$(BUILT_TESTS_ZIP_PACKAGE): \
$(INSTALLED_USERDATAIMAGE_TARGET) \
| $(ACP)
- @echo "Package test files: $@"
+ @echo -e ${CL_YLW}"Package test files:"${CL_RST} $@"
$(hide) rm -rf $@ $(zip_root)
$(hide) mkdir -p $(dir $@) $(zip_root)
@# Contents of the data image
@@ -1434,7 +1435,7 @@ name := $(name)-apps-$(FILE_NAME_TAG)
APPS_ZIP := $(PRODUCT_OUT)/$(name).zip
$(APPS_ZIP): $(INSTALLED_SYSTEMIMAGE)
- @echo -e ${CL_PFX}"Package apps:"${CL_RST}" $@"
+ @echo -e ${CL_YLW}"Package apps:"${CL_RST}" $@"
$(hide) rm -rf $@
$(hide) mkdir -p $(dir $@)
$(hide) zip -qj $@ $(TARGET_OUT_APPS)/*
@@ -1470,7 +1471,7 @@ name := $(TARGET_PRODUCT)-emulator-$(FILE_NAME_TAG)
INTERNAL_EMULATOR_PACKAGE_TARGET := $(PRODUCT_OUT)/$(name).zip
$(INTERNAL_EMULATOR_PACKAGE_TARGET): $(INTERNAL_EMULATOR_PACKAGE_FILES)
- @echo -e ${CL_PFX}"Package:"${CL_RST}" $@"
+ @echo -e ${CL_YLW}"Package:"${CL_RST}" $@"
$(hide) zip -qj $@ $(INTERNAL_EMULATOR_PACKAGE_FILES)
# -----------------------------------------------------------------
diff --git a/core/base_rules.mk b/core/base_rules.mk
index 3f1bf1c..6e007fc 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -481,7 +481,7 @@ $(cleantarget) : PRIVATE_CLEAN_FILES := \
$(LOCAL_INSTALLED_MODULE) \
$(intermediates)
$(cleantarget)::
- @echo "Clean: $(PRIVATE_MODULE)"
+ @echo -e ${CL_GRN}"Clean:"${CL_RST}" $(PRIVATE_MODULE)"
$(hide) rm -rf $(PRIVATE_CLEAN_FILES)
###########################################################
@@ -526,11 +526,11 @@ ifndef LOCAL_UNINSTALLABLE_MODULE
# installation; hence, LOCAL_ACP_UNAVAILABLE.
ifneq ($(LOCAL_ACP_UNAVAILABLE),true)
$(LOCAL_INSTALLED_MODULE): $(LOCAL_BUILT_MODULE) | $(ACP)
- @echo -e ${CL_INS}"Install: $@"${CL_RST}
+ @echo -e ${CL_CYN}"Install: $@"${CL_RST}
$(copy-file-to-new-target)
else
$(LOCAL_INSTALLED_MODULE): $(LOCAL_BUILT_MODULE)
- @echo -e ${CL_INS}"Install: $@"${CL_RST}
+ @echo -e ${CL_CYN}"Install: $@"${CL_RST}
$(copy-file-to-target-with-cp)
endif
@@ -538,7 +538,7 @@ ifdef LOCAL_DEX_PREOPT
installed_odex := $(basename $(LOCAL_INSTALLED_MODULE)).odex
built_odex := $(basename $(LOCAL_BUILT_MODULE)).odex
$(installed_odex) : $(built_odex) | $(ACP)
- @echo -e ${CL_INS}"Install: $@"${CL_RST}
+ @echo -e ${CL_CYN}"Install: $@"${CL_RST}
$(copy-file-to-target)
$(LOCAL_INSTALLED_MODULE) : $(installed_odex)
diff --git a/core/binary.mk b/core/binary.mk
index efd7473..06b9639 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -526,7 +526,7 @@ import_includes_deps := $(strip \
$(foreach l, $(LOCAL_STATIC_LIBRARIES) $(LOCAL_WHOLE_STATIC_LIBRARIES), \
$(call intermediates-dir-for,STATIC_LIBRARIES,$(l),$(LOCAL_IS_HOST_MODULE))/export_includes))
$(import_includes) : $(import_includes_deps)
- @echo Import includes file: $@
+ @echo -e ${CL_CYN}Import includes file:${CL_RST} $@
$(hide) mkdir -p $(dir $@) && rm -f $@
ifdef import_includes_deps
$(hide) for f in $^; do \
@@ -698,7 +698,7 @@ $(LOCAL_INSTALLED_MODULE): | $(installed_static_library_notice_file_targets)
export_includes := $(intermediates)/export_includes
$(export_includes): PRIVATE_EXPORT_C_INCLUDE_DIRS := $(LOCAL_EXPORT_C_INCLUDE_DIRS)
$(export_includes) : $(LOCAL_MODULE_MAKEFILE)
- @echo Export includes file: $< -- $@
+ @echo -e ${CL_CYN}Export includes file:${CL_RST} $< -- $@
$(hide) mkdir -p $(dir $@) && rm -f $@
ifdef LOCAL_EXPORT_C_INCLUDE_DIRS
$(hide) for d in $(PRIVATE_EXPORT_C_INCLUDE_DIRS); do \
diff --git a/core/cleanbuild.mk b/core/cleanbuild.mk
index e6db5cb..7750d4e 100644
--- a/core/cleanbuild.mk
+++ b/core/cleanbuild.mk
@@ -207,13 +207,13 @@ endif
dataclean: FILES := $(dataclean_files)
dataclean:
$(hide) rm -rf $(FILES)
- @echo "Deleted emulator userdata images."
+ @echo -e ${CL_GRN}"Deleted emulator userdata images."${CL_RST}
.PHONY: installclean
installclean: FILES := $(installclean_files)
installclean: dataclean
$(hide) rm -rf $(FILES)
- @echo "Deleted images and staging directories."
+ @echo -e ${CL_GRN}"Deleted images and staging directories."${CL_RST}
ifeq "$(force_installclean)" "true"
$(info *** Forcing "make installclean"...)
diff --git a/core/combo/HOST_darwin-x86.mk b/core/combo/HOST_darwin-x86.mk
index 95556ee..2bfa788 100644
--- a/core/combo/HOST_darwin-x86.mk
+++ b/core/combo/HOST_darwin-x86.mk
@@ -71,7 +71,7 @@ HOST_CUSTOM_LD_COMMAND := true
# Workaround for lack of "-Wl,--whole-archive" in MacOS's linker.
define _darwin-extract-and-include-single-whole-static-lib
-@echo "preparing StaticLib: $(PRIVATE_MODULE) [including $(1)]"
+@echo -e ${CL_YLW}"preparing StaticLib:"${CL_RST}" $(PRIVATE_MODULE) [including $(1)]"
$(hide) ldir=$(PRIVATE_INTERMEDIATES_DIR)/WHOLE/$(basename $(notdir $(1)))_objs;\
mkdir -p $$ldir; \
for f in `$(HOST_AR) t $(1)`; do \
diff --git a/core/definitions.mk b/core/definitions.mk
index 546e35a..04af09f 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -880,7 +880,7 @@ endef
define transform-cpp-to-o
@mkdir -p $(dir $@)
-@echo -e ${CL_PFX}"target $(PRIVATE_ARM_MODE) C++:"${CL_RST}" $(PRIVATE_MODULE) <= $<"
+@echo -e ${CL_GRN}"target $(PRIVATE_ARM_MODE) C++:"${CL_RST}" $(PRIVATE_MODULE) <= $<"
$(hide) $(PRIVATE_CXX) \
$(addprefix -I , $(PRIVATE_C_INCLUDES)) \
$(shell cat $(PRIVATE_IMPORT_INCLUDES)) \
@@ -931,12 +931,12 @@ $(hide) $(PRIVATE_CC) \
endef
define transform-c-to-o-no-deps
-@echo -e ${CL_PFX}"target $(PRIVATE_ARM_MODE) C:"${CL_RST}" $(PRIVATE_MODULE) <= $<"
+@echo -e ${CL_GRN}"target $(PRIVATE_ARM_MODE) C:"${CL_RST}" $(PRIVATE_MODULE) <= $<"
$(call transform-c-or-s-to-o-no-deps, )
endef
define transform-s-to-o-no-deps
-@echo -e ${CL_PFX}"target asm:"${CL_RST}" $(PRIVATE_MODULE) <= $<"
+@echo -e ${CL_GRN}"target asm:"${CL_RST}" $(PRIVATE_MODULE) <= $<"
$(call transform-c-or-s-to-o-no-deps, $(PRIVATE_ASFLAGS))
endef
@@ -957,7 +957,7 @@ endef
###########################################################
define transform-m-to-o-no-deps
-@echo -e ${CL_PFX}"target ObjC:"${CL_RST}" $(PRIVATE_MODULE) <= $<"
+@echo -e ${CL_GRN}"target ObjC:"${CL_RST}" $(PRIVATE_MODULE) <= $<"
$(call transform-c-or-s-to-o-no-deps)
endef
@@ -972,7 +972,7 @@ endef
define transform-host-cpp-to-o
@mkdir -p $(dir $@)
-@echo -e ${CL_PFX}"host C++:"${CL_RST}" $(PRIVATE_MODULE) <= $<"
+@echo -e ${CL_YLW}"host C++:"${CL_RST}" $(PRIVATE_MODULE) <= $<"
$(hide) $(PRIVATE_CXX) \
$(addprefix -I , $(PRIVATE_C_INCLUDES)) \
$(shell cat $(PRIVATE_IMPORT_INCLUDES)) \
@@ -1020,12 +1020,12 @@ $(hide) $(PRIVATE_CC) \
endef
define transform-host-c-to-o-no-deps
-@echo -e ${CL_PFX}"host C:"${CL_RST}" $(PRIVATE_MODULE) <= $<"
+@echo -e ${CL_YLW}"host C:"${CL_RST}" $(PRIVATE_MODULE) <= $<"
$(call transform-host-c-or-s-to-o-no-deps, )
endef
define transform-host-s-to-o-no-deps
-@echo "host asm: $(PRIVATE_MODULE) <= $<"
+@echo -e ${CL_YLW}"host asm:"${CL_RST}" $(PRIVATE_MODULE) <= $<"
$(call transform-host-c-or-s-to-o-no-deps, $(PRIVATE_ASFLAGS))
endef
@@ -1044,7 +1044,7 @@ endef
###########################################################
define transform-host-m-to-o-no-deps
-@echo "host ObjC: $(PRIVATE_MODULE) <= $<"
+@echo -e ${CL_YLW}"host ObjC:"${CL_RST}" $(PRIVATE_MODULE) <= $<"
$(call transform-host-c-or-s-to-o-no-deps)
endef
@@ -1077,7 +1077,7 @@ endef
# $(1): the full path of the source static library.
define _extract-and-include-single-target-whole-static-lib
-@echo "preparing StaticLib: $(PRIVATE_MODULE) [including $(1)]"
+@echo -e ${CL_YLW}"preparing StaticLib:"${CL_RST}" $(PRIVATE_MODULE) [including $(1)]"
$(hide) ldir=$(PRIVATE_INTERMEDIATES_DIR)/WHOLE/$(basename $(notdir $(1)))_objs;\
rm -rf $$ldir; \
mkdir -p $$ldir; \
@@ -1101,7 +1101,7 @@ define transform-o-to-static-lib
@mkdir -p $(dir $@)
@rm -f $@
$(extract-and-include-target-whole-static-libs)
-@echo "target StaticLib: $(PRIVATE_MODULE) ($@)"
+@echo -e ${CL_GRN}"target StaticLib:"${CL_RST}" $(PRIVATE_MODULE) ($@)"
$(call split-long-arguments,$(TARGET_AR) $(TARGET_GLOBAL_ARFLAGS) $(PRIVATE_ARFLAGS) $@,$(filter %.o, $^))
endef
@@ -1111,7 +1111,7 @@ endef
# $(1): the full path of the source static library.
define _extract-and-include-single-host-whole-static-lib
-@echo "preparing StaticLib: $(PRIVATE_MODULE) [including $(1)]"
+@echo -e ${CL_YLW}"preparing StaticLib:"${CL_RST}" $(PRIVATE_MODULE) [including $(1)]"
$(hide) ldir=$(PRIVATE_INTERMEDIATES_DIR)/WHOLE/$(basename $(notdir $(1)))_objs;\
rm -rf $$ldir; \
mkdir -p $$ldir; \
@@ -1135,7 +1135,7 @@ define transform-host-o-to-static-lib
@mkdir -p $(dir $@)
@rm -f $@
$(extract-and-include-host-whole-static-libs)
-@echo "host StaticLib: $(PRIVATE_MODULE) ($@)"
+@echo -e ${CL_YLW}"host StaticLib:"${CL_RST}" $(PRIVATE_MODULE) ($@)"
$(call split-long-arguments,$(HOST_AR) $(HOST_GLOBAL_ARFLAGS) $(PRIVATE_ARFLAGS) $@,$(filter %.o, $^))
endef
@@ -1172,13 +1172,13 @@ endif
define transform-host-o-to-shared-lib
@mkdir -p $(dir $@)
-@echo "host SharedLib: $(PRIVATE_MODULE) ($@)"
+@echo -e ${CL_YLW}"host SharedLib:"${CL_RST}" $(PRIVATE_MODULE) ($@)"
$(transform-host-o-to-shared-lib-inner)
endef
define transform-host-o-to-package
@mkdir -p $(dir $@)
-@echo "host Package: $(PRIVATE_MODULE) ($@)"
+@echo -e ${CL_YLW}"host Package:"${CL_RST}" $(PRIVATE_MODULE) ($@)"
$(transform-host-o-to-shared-lib-inner)
endef
@@ -1222,13 +1222,13 @@ endif
define transform-o-to-shared-lib
@mkdir -p $(dir $@)
-@echo "target SharedLib: $(PRIVATE_MODULE) ($@)"
+@echo -e ${CL_GRN}"target SharedLib:"${CL_RST}" $(PRIVATE_MODULE) ($@)"
$(transform-o-to-shared-lib-inner)
endef
define transform-o-to-package
@mkdir -p $(dir $@)
-@echo "target Package: $(PRIVATE_MODULE) ($@)"
+@echo -e ${CL_GRN}"target Package:"${CL_RST}" $(PRIVATE_MODULE) ($@)"
$(transform-o-to-shared-lib-inner)
endef
@@ -1239,7 +1239,7 @@ endef
define transform-to-stripped
@mkdir -p $(dir $@)
-@echo "target Strip: $(PRIVATE_MODULE) ($@)"
+@echo -e ${CL_GRN}"target Strip:"${CL_RST}" $(PRIVATE_MODULE) ($@)"
$(hide) $(TARGET_STRIP_COMMAND)
endef
@@ -1273,7 +1273,7 @@ endif
define transform-o-to-executable
@mkdir -p $(dir $@)
-@echo "target Executable: $(PRIVATE_MODULE) ($@)"
+@echo -e ${CL_GRN}"target Executable:"${CL_RST}" $(PRIVATE_MODULE) ($@)"
$(transform-o-to-executable-inner)
endef
@@ -1292,7 +1292,7 @@ endif
define transform-o-to-static-executable
@mkdir -p $(dir $@)
-@echo "target StaticExecutable: $(PRIVATE_MODULE) ($@)"
+@echo -e ${CL_GRN}"target StaticExecutable:"${CL_RST}" $(PRIVATE_MODULE) ($@)"
$(transform-o-to-static-executable-inner)
endef
@@ -1326,7 +1326,7 @@ endif
define transform-host-o-to-executable
@mkdir -p $(dir $@)
-@echo "host Executable: $(PRIVATE_MODULE) ($@)"
+@echo -e ${CL_YLW}"host Executable:"${CL_RST}" $(PRIVATE_MODULE) ($@)"
$(transform-host-o-to-executable-inner)
endef
@@ -1480,7 +1480,7 @@ $(hide) jar $(if $(strip $(PRIVATE_JAR_MANIFEST)),-cfm,-cf) \
endef
define transform-java-to-classes.jar
-@echo -e ${CL_PFX}"target Java:"${CL_RST}" $(PRIVATE_MODULE) ($(PRIVATE_CLASS_INTERMEDIATES_DIR))"
+@echo -e ${CL_GRN}"target Java:"${CL_RST}" $(PRIVATE_MODULE) ($(PRIVATE_CLASS_INTERMEDIATES_DIR))"
$(call compile-java,$(TARGET_JAVAC),$(PRIVATE_BOOTCLASSPATH))
$(hide) rm -rf $(PRIVATE_CLASS_INTERMEDIATES_DIR)
endef
@@ -1501,7 +1501,7 @@ $(hide) if [ -e $(PRIVATE_CLASS_INTERMEDIATES_DIR)/stamp ] ; then \
fi
$(hide) tr ' ' '\n' < $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list \
| sort -u > $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq
-@echo "(Incremental) build source files:"
+@echo -e ${CL_YLW}"(Incremental) build source files:"${CL_RST}""
@cat $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq
$(hide) if [ -s $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq ] ; then \
$(1) -encoding UTF-8 \
@@ -1529,7 +1529,7 @@ $(hide) mv $(PRIVATE_CLASS_INTERMEDIATES_DIR)/newstamp $(PRIVATE_CLASS_INTERMEDI
endef
define transform-java-to-classes.jar
-@echo -e ${CL_PFX}"target Java:"${CL_RST}" $(PRIVATE_MODULE) ($(PRIVATE_CLASS_INTERMEDIATES_DIR))"
+@echo -e ${CL_GRN}"target Java:"${CL_RST}" $(PRIVATE_MODULE) ($(PRIVATE_CLASS_INTERMEDIATES_DIR))"
$(call compile-java,$(TARGET_JAVAC),$(PRIVATE_BOOTCLASSPATH))
endef
endif # ENABLE_INCREMENTALJAVAC
@@ -1544,7 +1544,7 @@ endef
# only core.jar and framework.jar need a heap this big.
# Avoid the memory arguments on Windows, dx fails to load for some reason with them.
define transform-classes.jar-to-dex
-@echo "target Dex: $(PRIVATE_MODULE)"
+@echo -e ${CL_GRN}"target Dex:"${CL_RST}" $(PRIVATE_MODULE)"
@mkdir -p $(dir $@)
$(hide) $(DX) \
$(if $(findstring windows,$(HOST_OS)),,-JXms16M -JXmx$(if $(call streq,$(HOST_BITS),32),1024,2048)M) \
@@ -1659,7 +1659,7 @@ endef
# Note: we intentionally don't clean PRIVATE_CLASS_INTERMEDIATES_DIR
# in transform-java-to-classes for the sake of vm-tests.
define transform-host-java-to-package
-@echo "host Java: $(PRIVATE_MODULE) ($(PRIVATE_CLASS_INTERMEDIATES_DIR))"
+@echo -e ${CL_YLW}"host Java:"${CL_RST}" $(PRIVATE_MODULE) ($(PRIVATE_CLASS_INTERMEDIATES_DIR))"
$(call compile-java,$(HOST_JAVAC),$(PRIVATE_BOOTCLASSPATH))
$(if $(PRIVATE_EXTRA_JAR_ARGS), $(call add-java-resources-to-package))
endef
@@ -1673,7 +1673,7 @@ endef
# The module using this must depend on
# $(HOST_OUT_JAVA_LIBRARIES)/proguard-4.0.1.jar
define obfuscate-jar
-@echo "Obfuscate jar: $(notdir $@) ($@)"
+@echo -e ${CL_GRN}"Obfuscate jar:"${CL_RST}" $(notdir $@) ($@)"
@mkdir -p $(dir $@)
@rm -f $@
@mkdir -p $(PRIVATE_INTERMEDIATES_DIR)
@@ -1702,7 +1702,7 @@ endef
# $(2): destination header
define copy-one-header
$(2): $(1)
- @echo "Header: $$@"
+ @echo -e ${CL_YLW}"Header:"${CL_RST}" $$@"
$$(copy-file-to-new-target-with-cp)
endef
@@ -1711,7 +1711,7 @@ endef
# $(2): destination file
define copy-one-file
$(2): $(1) | $(ACP)
- @echo "Copy: $$@"
+ @echo -e ${CL_YLW}"Copy:"${CL_RST}" $$@"
$$(copy-file-to-target)
endef
@@ -1720,7 +1720,7 @@ endef
# $(2): destination file, must end with .xml.
define copy-xml-file-checked
$(2): $(1) | $(ACP)
- @echo "Copy xml: $$@"
+ @echo -e ${CL_YLW}"Copy xml:"${CL_RST}" $$@"
$(hide) xmllint $$< >/dev/null # Don't print the xml file to stdout.
$$(copy-file-to-target)
endef
@@ -1778,19 +1778,19 @@ endef
# Copy a prebuilt file to a target location.
define transform-prebuilt-to-target
-@echo "$(if $(PRIVATE_IS_HOST_MODULE),host,target) Prebuilt: $(PRIVATE_MODULE) ($@)"
+@echo -e "$(if $(PRIVATE_IS_HOST_MODULE),host,target) "${CL_CYN}"Prebuilt:"${CL_RST}" $(PRIVATE_MODULE) ($@)"
$(copy-file-to-target)
endef
# Copy a prebuilt file to a target location, using zipalign on it.
define transform-prebuilt-to-target-with-zipalign
-@echo "$(if $(PRIVATE_IS_HOST_MODULE),host,target) Prebuilt APK: $(PRIVATE_MODULE) ($@)"
+@echo "$(if $(PRIVATE_IS_HOST_MODULE),host,target) "${CL_CYN}"Prebuilt APK:"${CL_RST}" $(PRIVATE_MODULE) ($@)"
$(copy-file-to-target-with-zipalign)
endef
# Copy a prebuilt file to a target location, stripping "# comment" comments.
define transform-prebuilt-to-target-strip-comments
-@echo "$(if $(PRIVATE_IS_HOST_MODULE),host,target) Prebuilt: $(PRIVATE_MODULE) ($@)"
+@echo "$(if $(PRIVATE_IS_HOST_MODULE),host,target) "${CL_CYN}"Prebuilt:"${CL_RST}" $(PRIVATE_MODULE) ($@)"
$(copy-file-to-target-strip-comments)
endef
@@ -1827,14 +1827,14 @@ endif
# Command to copy the file with acp, if proguard is disabled.
define proguard-disabled-commands
-@echo Copying: $@
+@echo -e ${CL_CYN}"Copying:"${CL_RST}" $@"
$(hide) $(ACP) -fp $< $@
endef
# Command to call Proguard
# $(1): extra flags for instrumentation.
define proguard-enabled-commands
-@echo Proguard: $@
+@echo -e ${CL_GRN}"Proguard:"${CL_RST}" $@"
$(hide) $(PROGUARD) -injars $< -outjars $@ $(PRIVATE_PROGUARD_FLAGS) $(1)
endef
@@ -1857,7 +1857,7 @@ endef
###########################################################
define transform-generated-source
-@echo -e ${CL_PFX}"target Generated:"${CL_RST}" $(PRIVATE_MODULE) <= $<"
+@echo -e ${CL_GRN}"target Generated:"${CL_RST}" $(PRIVATE_MODULE) <= $<"
@mkdir -p $(dir $@)
$(hide) $(PRIVATE_CUSTOM_TOOL)
endef
diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk
index c12eda7..4488aae 100644
--- a/core/dex_preopt.mk
+++ b/core/dex_preopt.mk
@@ -48,7 +48,7 @@ $(eval _dbj_jar_no_dex := $(DEXPREOPT_BOOT_JAR_DIR_FULL_PATH)/$(1)_nodex.jar)
$(eval _dbj_src_jar := $(call intermediates-dir-for,JAVA_LIBRARIES,$(1),,COMMON)/javalib.jar)
$(eval $(_dbj_odex): PRIVATE_DBJ_JAR := $(_dbj_jar))
$(_dbj_odex) : $(_dbj_src_jar) | $(ACP) $(DEXPREOPT) $(DEXOPT)
- @echo "Dexpreopt Boot Jar: $$@"
+ @echo -e ${CL_GRN}"Dexpreopt Boot Jar:"${CL_RST}" $$@"
$(hide) rm -f $$@
$(hide) mkdir -p $$(dir $$@)
$(hide) $(ACP) -fp $$< $$(PRIVATE_DBJ_JAR)
diff --git a/core/distdir.mk b/core/distdir.mk
index e04938b..32b7013 100644
--- a/core/distdir.mk
+++ b/core/distdir.mk
@@ -37,7 +37,7 @@ ifdef dist_goal
define copy-one-dist-file
$(3): $(2)
$(2): $(1)
- @echo "Dist: $$@"
+ @echo -e ${CL_YLW}"Dist:"${CL_RST}" $$@"
$$(copy-file-to-new-target-with-cp)
endef
diff --git a/core/droiddoc.mk b/core/droiddoc.mk
index e312965..7074e99 100644
--- a/core/droiddoc.mk
+++ b/core/droiddoc.mk
@@ -156,7 +156,7 @@ $(full_target): PRIVATE_LOCAL_PATH := $(LOCAL_PATH)
html_dir_files := $(shell find $(LOCAL_PATH)/$(LOCAL_DROIDDOC_HTML_DIR) -type f)
$(full_target): $(full_src_files) $(droiddoc_templates) $(droiddoc) $(html_dir_files) $(full_java_lib_deps) $(LOCAL_ADDITIONAL_DEPENDENCIES)
- @echo Docs droiddoc: $(PRIVATE_OUT_DIR)
+ @echo -e ${CL_YLW}"Docs droiddoc:"${CL_RST}" $(PRIVATE_OUT_DIR)"
$(hide) mkdir -p $(dir $(full_target))
$(call prepare-doc-source-list,$(PRIVATE_SRC_LIST_FILE),$(PRIVATE_JAVA_FILES), \
$(PRIVATE_SOURCE_INTERMEDIATES_DIR) $(PRIVATE_ADDITIONAL_JAVA_DIR))
@@ -188,7 +188,7 @@ else
##
##
$(full_target): $(full_src_files) $(full_java_lib_deps)
- @echo Docs javadoc: $(PRIVATE_OUT_DIR)
+ @echo -e ${CL_YLW}"Docs javadoc:"${CL_RST}" $(PRIVATE_OUT_DIR)"
@mkdir -p $(dir $(full_target))
$(call prepare-doc-source-list,$(PRIVATE_SRC_LIST_FILE),$(PRIVATE_JAVA_FILES), \
$(PRIVATE_SOURCE_INTERMEDIATES_DIR) $(PRIVATE_ADDITIONAL_JAVA_DIR))
@@ -225,7 +225,7 @@ ifeq ($(strip $(LOCAL_UNINSTALLABLE_MODULE)),)
out_zip := $(OUT_DOCS)/$(LOCAL_MODULE)-docs.zip
$(out_zip): PRIVATE_DOCS_DIR := $(out_dir)
$(out_zip): $(full_target)
- @echo Package docs: $@
+ @echo -e ${CL_YLW}"Package docs:"${CL_RST}" $@"
@rm -f $@
@mkdir -p $(dir $@)
$(hide) ( F=$$(pwd)/$@ ; cd $(PRIVATE_DOCS_DIR) && zip -rq $$F * )
diff --git a/core/dynamic_binary.mk b/core/dynamic_binary.mk
index 0ca1858..d208866 100644
--- a/core/dynamic_binary.mk
+++ b/core/dynamic_binary.mk
@@ -79,7 +79,7 @@ compress_output := $(intermediates)/COMPRESSED-$(LOCAL_BUILT_MODULE_STEM)
#TODO: define a rule to build TARGET_SYMBOL_FILTER_FILE, and
# make it depend on ALL_ORIGINAL_DYNAMIC_BINARIES.
$(compress_output): $(compress_input) $(TARGET_SYMBOL_FILTER_FILE) | $(ACP)
- @echo "target Compress Symbols: $(PRIVATE_MODULE) ($@)"
+ @echo -e ${CL_GRN}"target Compress Symbols:"${CL_RST}" $(PRIVATE_MODULE) ($@)"
$(copy-file-to-target)
else
# Skip this step.
@@ -92,7 +92,7 @@ endif
symbolic_input := $(compress_output)
symbolic_output := $(LOCAL_UNSTRIPPED_PATH)/$(LOCAL_BUILT_MODULE_STEM)
$(symbolic_output) : $(symbolic_input) | $(ACP)
- @echo "target Symbolic: $(PRIVATE_MODULE) ($@)"
+ @echo -e ${CL_GRN}"target Symbolic:"${CL_RST}" $(PRIVATE_MODULE) ($@)"
$(copy-file-to-target)
@@ -118,11 +118,11 @@ else
# use cp(1) instead.
ifneq ($(LOCAL_ACP_UNAVAILABLE),true)
$(strip_output): $(strip_input) | $(ACP)
- @echo "target Unstripped: $(PRIVATE_MODULE) ($@)"
+ @echo -e ${CL_GRN}"target Unstripped:"${CL_RST}" $(PRIVATE_MODULE) ($@)"
$(copy-file-to-target)
else
$(strip_output): $(strip_input)
- @echo "target Unstripped: $(PRIVATE_MODULE) ($@)"
+ @echo -e ${CL_GRN}"target Unstripped:"${CL_RST}" $(PRIVATE_MODULE) ($@)"
$(copy-file-to-target-with-cp)
endif
endif # LOCAL_STRIP_MODULE
diff --git a/core/host_java_library.mk b/core/host_java_library.mk
index 6cc0b1f..90477c3 100644
--- a/core/host_java_library.mk
+++ b/core/host_java_library.mk
@@ -60,16 +60,16 @@ $(full_classes_compiled_jar): $(java_sources) $(java_resource_sources) $(full_ja
ifneq ($(strip $(LOCAL_JARJAR_RULES)),)
$(full_classes_jarjar_jar): PRIVATE_JARJAR_RULES := $(LOCAL_JARJAR_RULES)
$(full_classes_jarjar_jar): $(full_classes_compiled_jar) | $(JARJAR)
- @echo JarJar: $@
+ @echo -e ${CL_YLW}"JarJar:"${CL_RST}" $@"
$(hide) java -jar $(JARJAR) process $(PRIVATE_JARJAR_RULES) $< $@
else
$(full_classes_jarjar_jar): $(full_classes_compiled_jar) | $(ACP)
- @echo Copying: $@
+ @echo -e ${CL_YLW}"Copying:"${CL_RST}" $@"
$(hide) $(ACP) -fp $< $@
endif
$(full_classes_jar): $(full_classes_jarjar_jar) | $(ACP)
- @echo Copying: $@
+ @echo -e ${CL_YLW}"Copying:"${CL_RST}" $@"
$(hide) $(ACP) -fp $< $@
$(built_dex): PRIVATE_INTERMEDIATES_DIR := $(intermediates.COMMON)
@@ -79,7 +79,7 @@ $(built_dex): $(full_classes_jar) $(DX)
$(LOCAL_BUILT_MODULE): PRIVATE_DEX_FILE := $(built_dex)
$(LOCAL_BUILT_MODULE): $(built_dex) $(java_resource_sources) | $(AAPT)
- @echo "Host Jar: $(PRIVATE_MODULE) ($@)"
+ @echo -e ${CL_YLW}"Host Jar:"${CL_RST}" $(PRIVATE_MODULE) ($@)"
$(create-empty-package)
$(add-dex-to-package)
ifneq ($(extra_jar_args),)
diff --git a/core/java.mk b/core/java.mk
index 437fc08..d4d5e65 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -255,7 +255,7 @@ built_dex := $(intermediates.COMMON)/$(built_dex_leaf)
# PRIVATE_ vars to be preserved.
$(full_classes_stubs_jar): PRIVATE_SOURCE_FILE := $(full_classes_jar)
$(full_classes_stubs_jar) : $(LOCAL_BUILT_MODULE) | $(ACP)
- @echo Copying $(PRIVATE_SOURCE_FILE)
+ @echo -e ${CL_GRN}"Copying"${CL_RST}" $(PRIVATE_SOURCE_FILE)"
$(hide) $(ACP) -fp $(PRIVATE_SOURCE_FILE) $@
ALL_MODULES.$(LOCAL_MODULE).STUBS := $(full_classes_stubs_jar)
@@ -284,11 +284,11 @@ $(full_classes_compiled_jar): PRIVATE_JAVAC_DEBUG_FLAGS := -g
ifneq ($(strip $(LOCAL_JARJAR_RULES)),)
$(full_classes_jarjar_jar): PRIVATE_JARJAR_RULES := $(LOCAL_JARJAR_RULES)
$(full_classes_jarjar_jar): $(full_classes_compiled_jar) | $(JARJAR)
- @echo JarJar: $@
+ @echo -e ${CL_GRN}"JarJar:"${CL_RST}" $@"
$(hide) java -jar $(JARJAR) process $(PRIVATE_JARJAR_RULES) $< $@
else
$(full_classes_jarjar_jar): $(full_classes_compiled_jar) | $(ACP)
- @echo Copying: $@
+ @echo -e ${CL_GRN}"Copying:"${CL_RST}" $@"
$(hide) $(ACP) -fp $< $@
endif
@@ -320,13 +320,13 @@ $(PRIVATE_EMMA_COVERAGE_FILE): $(full_classes_emma_jar)
LOCAL_PROGUARD_FLAGS := $(LOCAL_PROGUARD_FLAGS) $(addprefix -libraryjars ,$(EMMA_JAR))
else
$(full_classes_emma_jar): $(full_classes_jarjar_jar) | $(ACP)
- @echo Copying: $@
+ @echo -e ${CL_GRN}"Copying:"${CL_RST}" $@"
$(copy-file-to-target)
endif
# Keep a copy of the jar just before proguard processing.
$(full_classes_jar): $(full_classes_emma_jar) | $(ACP)
- @echo Copying: $@
+ @echo -e ${CL_GRN}"Copying:"${CL_GRN}" $@"
$(hide) $(ACP) -fp $< $@
# Run proguard if necessary, otherwise just copy the file.
@@ -387,7 +387,7 @@ endif
$(built_dex_intermediate): $(full_classes_proguard_jar) $(DX)
$(transform-classes.jar-to-dex)
$(built_dex): $(built_dex_intermediate) | $(ACP)
- @echo Copying: $@
+ @echo -e ${CL_GRN}"Copying:"${CL_RST}" $@"
$(hide) $(ACP) -fp $< $@
ifneq ($(GENERATE_DEX_DEBUG),)
$(install-dex-debug)
diff --git a/core/java_library.mk b/core/java_library.mk
index 06cdfc4..7248e87 100644
--- a/core/java_library.mk
+++ b/core/java_library.mk
@@ -51,7 +51,7 @@ include $(BUILD_SYSTEM)/java.mk
ifeq ($(LOCAL_IS_STATIC_JAVA_LIBRARY),true)
# No dex; all we want are the .class files with resources.
$(common_javalib.jar) : $(full_classes_jar) $(java_resource_sources)
- @echo "target Static Jar: $(PRIVATE_MODULE) ($@)"
+ @echo -e ${CL_GRN}"target Static Jar:"${CL_RST}" $(PRIVATE_MODULE) ($@)"
$(copy-file-to-target)
ifneq ($(extra_jar_args),)
$(add-java-resources-to-package)
@@ -64,7 +64,7 @@ else # !LOCAL_IS_STATIC_JAVA_LIBRARY
$(common_javalib.jar): PRIVATE_DEX_FILE := $(built_dex)
$(common_javalib.jar) : $(built_dex) $(java_resource_sources) | $(AAPT)
- @echo "target Jar: $(PRIVATE_MODULE) ($@)"
+ @echo -e ${CL_GRN}"target Jar:"${CL_RST}" $(PRIVATE_MODULE) ($@)"
$(create-empty-package)
$(add-dex-to-package)
ifneq ($(extra_jar_args),)
@@ -90,7 +90,7 @@ $(built_odex): PRIVATE_MODULE := $(LOCAL_MODULE)
# Make sure the boot jars get dex-preopt-ed first
$(built_odex) : $(DEXPREOPT_BOOT_ODEXS)
$(built_odex) : $(common_javalib.jar) | $(DEXPREOPT) $(DEXOPT)
- @echo "Dexpreopt Jar: $(PRIVATE_MODULE) ($@)"
+ @echo -e ${CL_GRN}"Dexpreopt Jar:"${CL_RST}" $(PRIVATE_MODULE) ($@)"
$(hide) rm -f $@
@mkdir -p $(dir $@)
$(call dexpreopt-one-file,$<,$@)
diff --git a/core/main.mk b/core/main.mk
index 627d862..f0b4602 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -805,7 +805,7 @@ $(foreach module,$(sample_MODULES),$(eval $(call \
sample_ADDITIONAL_INSTALLED := \
$(filter-out $(modules_to_install) $(modules_to_check) $(ALL_PREBUILT),$(sample_MODULES))
samplecode: $(sample_APKS_COLLECTION)
- @echo "Collect sample code apks: $^"
+ @echo -e ${CL_GRN}"Collect sample code apks:"${CL_RST}" $^"
# remove apks that are not intended to be installed.
rm -f $(sample_ADDITIONAL_INSTALLED)
@@ -815,7 +815,7 @@ findbugs: $(INTERNAL_FINDBUGS_HTML_TARGET) $(INTERNAL_FINDBUGS_XML_TARGET)
.PHONY: clean
clean:
@rm -rf $(OUT_DIR)/*
- @echo "Entire build directory removed."
+ @echo -e ${CL_GRN}"Entire build directory removed."${CL_RST}
.PHONY: clobber
clobber: clean
@@ -825,7 +825,7 @@ clobber: clean
#xxx scrape this from ALL_MODULE_NAME_TAGS
.PHONY: modules
modules:
- @echo "Available sub-modules:"
+ @echo -e ${CL_GRN}"Available sub-modules:"${CL_RST}
@echo "$(call module-names-for-tag-list,$(ALL_MODULE_TAGS))" | \
tr -s ' ' '\n' | sort -u | $(COLUMN)
diff --git a/core/notice_files.mk b/core/notice_files.mk
index 74beb49..4c8c096 100644
--- a/core/notice_files.mk
+++ b/core/notice_files.mk
@@ -47,7 +47,7 @@ installed_notice_file := $($(my_prefix)OUT_NOTICE_FILES)/src/$(module_installed_
$(installed_notice_file): PRIVATE_INSTALLED_MODULE := $(module_installed_filename)
$(installed_notice_file): $(notice_file)
- @echo Notice file: $< -- $@
+ @echo -e ${CL_CYN}Notice file:${CL_RST} $< -- $@
$(hide) mkdir -p $(dir $@)
$(hide) cat $< >> $@
diff --git a/core/package.mk b/core/package.mk
index c689031..fb26b4e 100644
--- a/core/package.mk
+++ b/core/package.mk
@@ -210,7 +210,7 @@ $(R_file_stamp): PRIVATE_RESOURCE_PUBLICS_OUTPUT := \
$(intermediates.COMMON)/public_resources.xml
$(R_file_stamp): PRIVATE_PROGUARD_OPTIONS_FILE := $(proguard_options_file)
$(R_file_stamp): $(all_res_assets) $(full_android_manifest) $(RenderScript_file_stamp) $(AAPT) | $(ACP)
- @echo "target R.java/Manifest.java: $(PRIVATE_MODULE) ($@)"
+ @echo -e ${CL_YLW}"target R.java/Manifest.java:"${CL_RST}" $(PRIVATE_MODULE) ($@)"
@rm -f $@
$(create-resource-java-files)
$(hide) for GENERATED_MANIFEST_FILE in `find $(PRIVATE_SOURCE_INTERMEDIATES_DIR) \
@@ -242,7 +242,7 @@ $(R_file_stamp): $(resource_export_package)
$(resource_export_package): PRIVATE_PRODUCT_AAPT_CONFIG :=
$(resource_export_package): PRIVATE_PRODUCT_AAPT_PREF_CONFIG :=
$(resource_export_package): $(all_res_assets) $(full_android_manifest) $(RenderScript_file_stamp) $(AAPT)
- @echo "target Export Resources: $(PRIVATE_MODULE) ($@)"
+ @echo -e ${CL_GRN}"target Export Resources:"${CL_RST}" $(PRIVATE_MODULE) ($@)"
$(create-empty-package)
$(add-assets-to-package)
endif
@@ -375,7 +375,7 @@ else
$(LOCAL_BUILT_MODULE): PRIVATE_PRODUCT_AAPT_PREF_CONFIG := $(PRODUCT_AAPT_PREF_CONFIG)
endif
$(LOCAL_BUILT_MODULE): $(all_res_assets) $(jni_shared_libraries) $(full_android_manifest)
- @echo "target Package: $(PRIVATE_MODULE) ($@)"
+ @echo -e ${CL_GRN}"target Package:"${CL_RST}" $(PRIVATE_MODULE) ($@)"
$(create-empty-package)
$(add-assets-to-package)
ifneq ($(jni_shared_libraries),)
diff --git a/core/pdk_config.mk b/core/pdk_config.mk
index 9df2ce2..490e49f 100644
--- a/core/pdk_config.mk
+++ b/core/pdk_config.mk
@@ -87,7 +87,7 @@ endif
endif
$(_pdk_fusion_stamp) : $(PDK_FUSION_PLATFORM_ZIP)
- @echo "Unzip $(dir $@) <- $<"
+ @echo -e ${CL_YLW}"Unzip"${CL_RST}" $(dir $@) <- $<"
$(hide) rm -rf $(dir $@) && mkdir -p $(dir $@)
$(hide) unzip -qo $< -d $(dir $@)
$(call split-long-arguments,-touch,$(_pdk_fusion_files))
diff --git a/core/raw_executable.mk b/core/raw_executable.mk
index b64173a..d43bff0 100644
--- a/core/raw_executable.mk
+++ b/core/raw_executable.mk
@@ -14,7 +14,7 @@ $(all_objects) : PRIVATE_TARGET_GLOBAL_CPPFLAGS :=
$(LOCAL_BUILT_MODULE): $(all_objects) $(all_libraries)
@$(mkdir -p $(dir $@)
- @echo "target Linking: $(PRIVATE_MODULE)"
+ @echo -e ${CL_GRN}"target Linking:"${CL_RST}" $(PRIVATE_MODULE)"
$(hide) $(TARGET_LD) \
$(addprefix --script ,$(PRIVATE_LINK_SCRIPT)) \
$(PRIVATE_RAW_EXECUTABLE_LDFLAGS) \
diff --git a/core/static_java_library.mk b/core/static_java_library.mk
index eaa74aa..e05892e 100644
--- a/core/static_java_library.mk
+++ b/core/static_java_library.mk
@@ -99,7 +99,7 @@ $(R_file_stamp): PRIVATE_MANIFEST_PACKAGE_NAME :=
$(R_file_stamp): PRIVATE_MANIFEST_INSTRUMENTATION_FOR :=
$(R_file_stamp) : $(all_resources) $(full_android_manifest) $(AAPT) $(framework_res_package_export_deps)
- @echo "target R.java/Manifest.java: $(PRIVATE_MODULE) ($@)"
+ @echo -e ${CL_YLW}"target R.java/Manifest.java:"${CL_RST}" $(PRIVATE_MODULE) ($@)"
$(create-resource-java-files)
$(hide) find $(PRIVATE_SOURCE_INTERMEDIATES_DIR) -name R.java | xargs cat > $@
diff --git a/core/tasks/apicheck.mk b/core/tasks/apicheck.mk
index 8d9928e..c6d2ab1 100644
--- a/core/tasks/apicheck.mk
+++ b/core/tasks/apicheck.mk
@@ -32,7 +32,7 @@ ifeq (,$(filter true, $(BUILD_TINY_ANDROID) $(TARGET_BUILD_PDK)))
# $(5) command to run if apicheck failed
define check-api
$(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/$(strip $(1))-timestamp: $(2) $(3) $(APICHECK)
- @echo "Checking API:" $(1)
+ @echo -e ${CL_YLW}"Checking API:"${CL_RST} $(1)
$(hide) ( $(APICHECK_COMMAND) $(4) $(2) $(3) || ( $(5) ; exit 38 ) )
$(hide) mkdir -p $$(dir $$@)
$(hide) touch $$@
@@ -77,7 +77,7 @@ $(eval $(call check-api, \
.PHONY: update-api
update-api: $(INTERNAL_PLATFORM_API_FILE) | $(ACP)
- @echo Copying current.txt
+ @echo -e ${CL_GRN}"Copying current.txt"${CL_RST}
$(hide) $(ACP) $(INTERNAL_PLATFORM_API_FILE) $(SRC_API_DIR)/current.txt
endif
diff --git a/core/tasks/collect_gpl_sources.mk b/core/tasks/collect_gpl_sources.mk
index 3c7afcc..2bd9f92 100644
--- a/core/tasks/collect_gpl_sources.mk
+++ b/core/tasks/collect_gpl_sources.mk
@@ -16,7 +16,7 @@ gpl_source_tgz := $(call intermediates-dir-for,PACKAGING,gpl_source,HOST,COMMON)
$(gpl_source_tgz): PRIVATE_PATHS := $(sort $(patsubst %/, %, $(dir $(ALL_GPL_MODULE_LICENSE_FILES))))
$(gpl_source_tgz) : $(ALL_GPL_MODULE_LICENSE_FILES)
- @echo Package gpl sources: $@
+ @echo -e ${CL_GRN}"Package gpl sources:"${CL_RST}" $@"
@rm -rf $(dir $@) && mkdir -p $(dir $@)
$(hide) tar cfz $@ --exclude ".git*" $(PRIVATE_PATHS)
diff --git a/core/tasks/product-graph.mk b/core/tasks/product-graph.mk
index 6442252..fc8ca5c 100644
--- a/core/tasks/product-graph.mk
+++ b/core/tasks/product-graph.mk
@@ -18,7 +18,7 @@ products_pdf := $(OUT_DIR)/products.pdf
products_graph := $(products_pdf:%.pdf=%.dot)
$(products_graph):
- @echo Product graph DOT: $@
+ @echo -e ${CL_GRN}"Product graph DOT:"${CL_RST}" $@"
$(hide) ( \
echo 'digraph {'; \
echo 'graph [ ratio=.5 ];'; \
@@ -41,7 +41,7 @@ $(products_graph):
# $(foreach p,$(ALL_PRODUCTS), echo \"$(p)\";) \
$(products_pdf): $(products_graph)
- @echo Product graph PDF: $@
+ @echo -e ${CL_GRN}"Product graph PDF:"${CL_RST}" $@"
dot -Tpdf -Nshape=box -o $@ $<
product-graph: $(products_pdf)
diff --git a/core/tasks/sdk-addon.mk b/core/tasks/sdk-addon.mk
index 5a24a00..a9079e7 100644
--- a/core/tasks/sdk-addon.mk
+++ b/core/tasks/sdk-addon.mk
@@ -79,7 +79,7 @@ $(full_target): PRIVATE_DOCS_DIRS := $(addprefix $(OUT_DOCS)/, $(doc_modules))
$(full_target): PRIVATE_STAGING_DIR := $(staging)
$(full_target): $(sdk_addon_deps) | $(ACP)
- @echo Packaging SDK Addon: $@
+ @echo -e ${CL_GRN}"Packaging SDK Addon:"${CL_RST}" $@"
$(hide) mkdir -p $(PRIVATE_STAGING_DIR)/docs
$(hide) for d in $(PRIVATE_DOCS_DIRS); do \
$(ACP) -r $$d $(PRIVATE_STAGING_DIR)/docs ;\
diff --git a/tools/apicheck/Android.mk b/tools/apicheck/Android.mk
index 1674a17..1505c8d 100644
--- a/tools/apicheck/Android.mk
+++ b/tools/apicheck/Android.mk
@@ -32,7 +32,7 @@ include $(BUILD_SYSTEM)/base_rules.mk
$(LOCAL_BUILT_MODULE): $(HOST_OUT_JAVA_LIBRARIES)/doclava$(COMMON_JAVA_PACKAGE_SUFFIX)
$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/etc/apicheck | $(ACP)
- @echo "Copy: $(PRIVATE_MODULE) ($@)"
+ @echo -e ${CL_CYN}"Copy:"${CL_RST}" $(PRIVATE_MODULE) ($@)"
$(copy-file-to-new-target)
$(hide) chmod 755 $@
generated by cgit v1.1 at 2024-09-07 14:43:57 +0000