Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4b37672 authored by Luca Stefani's avatar Luca Stefani
Browse files

build: Kill colors 

Change-Id: Icf29909e3df69832a58f3c654a6ed92251d817ca
parent 867294ec

core/Makefile

+23 −35
Original line number Diff line number Diff line 
# Put some miscellaneous rules here



# Build system colors



ifneq ($(BUILD_WITH_COLORS),0)

  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



# HACK: clear LOCAL_PATH from including last build target before calling

# intermedites-dir-for

LOCAL_PATH := $(BUILD_SYSTEM)
@@ -581,7 +569,7 @@ $(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_FILES) $(BOOT_S 
	$(hide) $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_ARGS) $(INTERNAL_MKBOOTIMG_VERSION_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $@

	$(BOOT_SIGNER) /boot $@ $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).pk8 $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).x509.pem $@

	$(hide) $(call assert-max-image-size,$@,$(BOARD_BOOTIMAGE_PARTITION_SIZE))

	@echo -e ${CL_CYN}"Made boot image: $@"${CL_RST}

	@echo "Made boot image: $@"



.PHONY: bootimage-nodeps

bootimage-nodeps: $(MKBOOTIMG) $(BOOT_SIGNER)
@@ -589,7 +577,7 @@ bootimage-nodeps: $(MKBOOTIMG) $(BOOT_SIGNER) 
	$(hide) $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_ARGS) $(INTERNAL_MKBOOTIMG_VERSION_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $(INSTALLED_BOOTIMAGE_TARGET)

	$(BOOT_SIGNER) /boot $(INSTALLED_BOOTIMAGE_TARGET) $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).pk8 $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).x509.pem $(INSTALLED_BOOTIMAGE_TARGET)

	$(hide) $(call assert-max-image-size,$(INSTALLED_BOOTIMAGE_TARGET),$(BOARD_BOOTIMAGE_PARTITION_SIZE))

	@echo -e ${CL_CYN}"Made boot image: $@"${CL_RST}

	@echo "Made boot image: $@"



else ifndef BOARD_CUSTOM_BOOTIMG_MK
@@ -600,7 +588,7 @@ $(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_FILES) $(VBOOT_ 
	$(hide) $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_ARGS) $(INTERNAL_MKBOOTIMG_VERSION_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $@.unsigned

	$(VBOOT_SIGNER) $(FUTILITY) $@.unsigned $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VBOOT_SIGNING_KEY).vbpubk $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VBOOT_SIGNING_KEY).vbprivk $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VBOOT_SIGNING_SUBKEY).vbprivk $@.keyblock $@

	$(hide) $(call assert-max-image-size,$@,$(BOARD_BOOTIMAGE_PARTITION_SIZE))

	@echo -e ${CL_CYN}"Made boot image: $@"${CL_RST}

	@echo "Made boot image: $@"



.PHONY: bootimage-nodeps

bootimage-nodeps: $(MKBOOTIMG) $(VBOOT_SIGNER)
@@ -608,7 +596,7 @@ bootimage-nodeps: $(MKBOOTIMG) $(VBOOT_SIGNER) 
	$(hide) $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_ARGS) $(INTERNAL_MKBOOTIMG_VERSION_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $(INSTALLED_BOOTIMAGE_TARGET).unsigned

	$(VBOOT_SIGNER) $(FUTILITY) $(INSTALLED_BOOTIMAGE_TARGET).unsigned $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VBOOT_SIGNING_KEY).vbpubk $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VBOOT_SIGNING_KEY).vbprivk $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VBOOT_SIGNING_SUBKEY).vbprivk $(INSTALLED_BOOTIMAGE_TARGET).keyblock $(INSTALLED_BOOTIMAGE_TARGET)

	$(hide) $(call assert-max-image-size,$(INSTALLED_BOOTIMAGE_TARGET),$(BOARD_BOOTIMAGE_PARTITION_SIZE))

	@echo -e ${CL_CYN}"Made boot image: $@"${CL_RST}

	@echo "Made boot image: $@"



  else # PRODUCT_SUPPORTS_VBOOT != true
@@ -616,14 +604,14 @@ $(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_FILES) $(BOOTIM 
	$(call pretty,"Target boot image: $@")

	$(hide) $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_ARGS) $(INTERNAL_MKBOOTIMG_VERSION_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $@

	$(hide) $(call assert-max-image-size,$@,$(BOARD_BOOTIMAGE_PARTITION_SIZE))

	@echo -e ${CL_CYN}"Made boot image: $@"${CL_RST}

	@echo "Made boot image: $@"



.PHONY: bootimage-nodeps

bootimage-nodeps: $(MKBOOTIMG)

	@echo "make $@: ignoring dependencies"

	$(hide) $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_ARGS) $(INTERNAL_MKBOOTIMG_VERSION_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $(INSTALLED_BOOTIMAGE_TARGET)

	$(hide) $(call assert-max-image-size,$(INSTALLED_BOOTIMAGE_TARGET),$(BOARD_BOOTIMAGE_PARTITION_SIZE))

	@echo -e ${CL_CYN}"Made boot image: $@"${CL_RST}

	@echo "Made boot image: $@"



  endif # PRODUCT_SUPPORTS_VBOOT

endif # TARGET_BOOTIMAGE_USE_EXT2 / BOARD_CUSTOM_BOOTIMG_MK
@@ -731,7 +719,7 @@ endif # TARGET_BUILD_APPS 
$(kernel_notice_file): \

	    $(BUILD_SYSTEM)/LINUX_KERNEL_COPYING \

	    | $(ACP)

	@echo -e ${CL_CYN}"Copying:"${CL_RST}" $@"

	@echo "Copying:"" $@"

	$(hide) mkdir -p $(dir $@)

	$(hide) $(ACP) $< $@
@@ -1040,12 +1028,12 @@ $(RECOVERY_INSTALL_OTA_KEYS): $(OTA_PUBLIC_KEYS) $(DUMPKEY_JAR) $(extra_keys) 
	java -jar $(DUMPKEY_JAR) $(PRIVATE_OTA_PUBLIC_KEYS) $(extra_keys) > $@



define build-recoveryramdisk

  @echo -e ${CL_CYN}"----- Making recovery ramdisk ------"${CL_RST}

  @echo "----- Making recovery ramdisk ------"

  $(hide) mkdir -p $(TARGET_RECOVERY_OUT)

  $(hide) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/etc $(TARGET_RECOVERY_ROOT_OUT)/sdcard $(TARGET_RECOVERY_ROOT_OUT)/tmp

  @echo -e ${CL_CYN}"Copying baseline ramdisk..."${CL_RST}

  @echo "Copying baseline ramdisk..."

  $(hide) rsync -a --exclude=etc --exclude=sdcard $(TARGET_ROOT_OUT) $(TARGET_RECOVERY_OUT) # "cp -Rf" fails to overwrite broken symlinks on Mac.

  @echo -e ${CL_CYN}"Modifying ramdisk contents..."${CL_RST}

  @echo "Modifying ramdisk contents..."

  $(hide) rm -f $(TARGET_RECOVERY_ROOT_OUT)/init*.rc

  $(hide) cp -f $(recovery_initrc) $(TARGET_RECOVERY_ROOT_OUT)/

  $(hide) rm -f $(TARGET_RECOVERY_ROOT_OUT)/sepolicy
@@ -1085,7 +1073,7 @@ define build-recoveryimage-target 
  $(if $(filter true,BOARD_USES_RECOVERY_AS_BOOT), \

    $(hide) $(call assert-max-image-size,$(1),$(BOARD_BOOTIMAGE_PARTITION_SIZE)), \

    $(hide) $(call assert-max-image-size,$(1),$(BOARD_RECOVERYIMAGE_PARTITION_SIZE)))

  @echo -e ${CL_CYN}"Made recovery image: $@"${CL_RST}

  @echo "Made recovery image: $@"

endef



ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true)
@@ -1120,18 +1108,18 @@ $(recovery_uncompressed_ramdisk): $(MKBOOTFS) \ 
		$(recovery_fstab) \

		$(RECOVERY_INSTALL_OTA_KEYS)

	$(call build-recoveryramdisk)

	@echo -e ${CL_CYN}"----- Making uncompressed recovery ramdisk ------"${CL_RST}

	@echo "----- Making uncompressed recovery ramdisk ------"

	$(hide) $(MKBOOTFS) $(TARGET_RECOVERY_ROOT_OUT) > $@



$(recovery_ramdisk): $(MINIGZIP) \

		$(recovery_uncompressed_ramdisk)

	@echo -e ${CL_CYN}"----- Making compressed recovery ramdisk ------"${CL_RST}

	@echo "----- Making compressed recovery ramdisk ------"

	$(hide) $(MINIGZIP) < $(recovery_uncompressed_ramdisk) > $@



ifndef BOARD_CUSTOM_BOOTIMG_MK

$(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTIMG) $(recovery_ramdisk) $(recovery_kernel) \

		$(RECOVERYIMAGE_EXTRA_DEPS)

	@echo -e ${CL_CYN}"----- Making recovery image ------"${CL_RST}

	@echo "----- Making recovery image ------"

	$(call build-recoveryimage-target, $@)

endif # BOARD_CUSTOM_BOOTIMG_MK
@@ -1297,7 +1285,7 @@ $(RECOVERY_FROM_BOOT_PATCH): $(INSTALLED_RECOVERYIMAGE_TARGET) \ 
                             $(INSTALLED_BOOTIMAGE_TARGET) \

			     $(HOST_OUT_EXECUTABLES)/imgdiff \

	                     $(HOST_OUT_EXECUTABLES)/bsdiff

	@echo -e ${CL_CYN}"Construct recovery from boot"${CL_RST}

	@echo "Construct recovery from boot"

	mkdir -p $(dir $@)

ifeq ($(TARGET_NOT_USE_GZIP_RECOVERY_RAMDISK),true)

	PATH=$(HOST_OUT_EXECUTABLES):$$PATH $(HOST_OUT_EXECUTABLES)/bsdiff $(INSTALLED_BOOTIMAGE_TARGET) $(INSTALLED_RECOVERYIMAGE_TARGET) $@
@@ -1311,7 +1299,7 @@ endif 




$(INSTALLED_SYSTEMIMAGE): $(BUILT_SYSTEMIMAGE) $(RECOVERY_FROM_BOOT_PATCH) | $(ACP)

	@echo -e ${CL_CYN}"Install system fs image: $@"${CL_RST}

	@echo "Install system fs image: $@"

	$(copy-file-to-target)

	$(hide) $(call assert-max-image-size,$@ $(RECOVERY_FROM_BOOT_PATCH),$(BOARD_SYSTEMIMAGE_PARTITION_SIZE))
@@ -1815,7 +1803,7 @@ $(BUILT_TARGET_FILES_PACKAGE): \ 
		$(APKCERTS_FILE) \

		$(HOST_OUT_EXECUTABLES)/fs_config \

		| $(ACP)

	@echo -e ${CL_YLW}"Package target files:"${CL_RST}" $@"

	@echo "Package target files:"" $@"

	$(hide) rm -rf $@ $(zip_root)

	$(hide) mkdir -p $(dir $@) $(zip_root)

ifneq (,$(INSTALLED_RECOVERYIMAGE_TARGET)$(filter true,$(BOARD_USES_RECOVERY_AS_BOOT)))
@@ -2119,7 +2107,7 @@ endif 
$(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE)

	@echo "$(OTA_FROM_TARGET_SCRIPT)" > $(PRODUCT_OUT)/ota_script_path

	@echo "$(override_device)" > $(PRODUCT_OUT)/ota_override_device

	@echo -e ${CL_YLW}"Package OTA:"${CL_RST}" $@"

	@echo "Package OTA:"" $@"

	$(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH MKBOOTIMG=$(MKBOOTIMG) \

	   $(OTA_FROM_TARGET_SCRIPT) -v \

	   $(block_based) \
@@ -2137,7 +2125,7 @@ otapackage: $(INTERNAL_OTA_PACKAGE_TARGET) 
bacon: otapackage

	$(hide) ln -f $(INTERNAL_OTA_PACKAGE_TARGET) $(CM_TARGET_PACKAGE)

	$(hide) $(MD5SUM) $(CM_TARGET_PACKAGE) > $(CM_TARGET_PACKAGE).md5sum

	@echo -e ${CL_CYN}"Package Complete: $(CM_TARGET_PACKAGE)"${CL_RST}

	@echo "Package Complete: $(CM_TARGET_PACKAGE)"



endif    # build_ota_package

# -----------------------------------------------------------------
@@ -2155,7 +2143,7 @@ $(INTERNAL_FACTORY_PACKAGE_TARGET): extensions := $(TARGET_RELEASETOOLS_EXTENSIO 
endif



$(INTERNAL_FACTORY_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS)

	@echo -e ${CL_YLW}"Package:"${CL_RST}" $@"

	@echo "Package:"" $@"

	if [ -z $(TARGET_RELEASETOOL_FACTORY_FROM_TARGET_SCRIPT) ]; then \

          echo "Error: Factory script is not defined by target"; \

          exit 1; \
@@ -2187,7 +2175,7 @@ else 
endif



$(INTERNAL_UPDATE_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE)

	@echo -e ${CL_YLW}"Package:"${CL_RST}" $@"

	@echo "Package:"" $@"

	$(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH MKBOOTIMG=$(MKBOOTIMG) \

	   $(IMG_FROM_TARGET_SCRIPT) -v \

	   -p $(HOST_OUT) \
@@ -2229,7 +2217,7 @@ name := $(name)-apps-$(FILE_NAME_TAG) 


APPS_ZIP := $(PRODUCT_OUT)/$(name).zip

$(APPS_ZIP): $(INSTALLED_SYSTEMIMAGE)

	@echo -e ${CL_YLW}"Package apps:"${CL_RST}" $@"

	@echo "Package apps:"" $@"

	$(hide) rm -rf $@

	$(hide) mkdir -p $(dir $@)

	$(hide) apps_to_zip=`find $(TARGET_OUT_APPS) $(TARGET_OUT_APPS_PRIVILEGED) -mindepth 2 -maxdepth 3 -name "*.apk"`; \
@@ -2296,7 +2284,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_YLW}"Package:"${CL_RST}" $@"

	@echo "Package:"" $@"

	$(hide) zip -qjX $@ $(INTERNAL_EMULATOR_PACKAGE_FILES)



endif

core/base_rules.mk

+3 −3
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ $(cleantarget) : PRIVATE_CLEAN_FILES := \ 
    $(LOCAL_INSTALLED_MODULE) \

    $(intermediates)

$(cleantarget)::

	@echo -e ${CL_GRN}"Clean:"${CL_RST}" $(PRIVATE_MODULE)"

	@echo "Clean:"" $(PRIVATE_MODULE)"

	$(hide) rm -rf $(PRIVATE_CLEAN_FILES)



###########################################################
@@ -313,12 +313,12 @@ ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE)) 
$(LOCAL_INSTALLED_MODULE): PRIVATE_POST_INSTALL_CMD := $(LOCAL_POST_INSTALL_CMD)

ifneq ($(LOCAL_ACP_UNAVAILABLE),true)

$(LOCAL_INSTALLED_MODULE): $(LOCAL_BUILT_MODULE) | $(ACP)

	@echo -e ${CL_CYN}"Install: $@"${CL_RST}

	@echo "Install: $@"

	$(copy-file-to-new-target)

	$(PRIVATE_POST_INSTALL_CMD)

else

$(LOCAL_INSTALLED_MODULE): $(LOCAL_BUILT_MODULE)

	@echo -e ${CL_CYN}"Install: $@"${CL_RST}

	@echo "Install: $@"

	$(copy-file-to-target-with-cp)

endif

core/binary.mk

+2 −2
Original line number Diff line number Diff line
@@ -1201,7 +1201,7 @@ import_includes_deps := $(strip \ 
      $(call intermediates-dir-for,STATIC_LIBRARIES,$(l),$(LOCAL_IS_HOST_MODULE),,$(LOCAL_2ND_ARCH_VAR_PREFIX),$(my_host_cross))/export_includes))

$(import_includes): PRIVATE_IMPORT_EXPORT_INCLUDES := $(import_includes_deps)

$(import_includes) : $(LOCAL_MODULE_MAKEFILE_DEP) $(import_includes_deps)

	@echo -e ${CL_CYN}Import includes file:${CL_RST} $@

	@echo Import includes file: $@

	$(hide) mkdir -p $(dir $@) && rm -f $@

ifdef import_includes_deps

	$(hide) for f in $(PRIVATE_IMPORT_EXPORT_INCLUDES); do \
@@ -1454,7 +1454,7 @@ $(export_includes): PRIVATE_EXPORT_C_INCLUDE_DIRS := $(my_export_c_include_dirs) 
# People are not going to consume the aidl generated cpp file, but the cpp file is

# generated after the headers, so this is a convenient way to ensure the headers exist.

$(export_includes) : $(LOCAL_MODULE_MAKEFILE_DEP) $(proto_generated_headers) $(dbus_generated_headers) $(aidl_gen_cpp) $(vts_gen_cpp)

	@echo -e ${CL_CYN}Export includes file:${CL_RST} $< -- $@

	@echo Export includes file: $< -- $@

	$(hide) mkdir -p $(dir $@) && rm -f $@.tmp

ifdef my_export_c_include_dirs

	$(hide) for d in $(PRIVATE_EXPORT_C_INCLUDE_DIRS); do \

core/cleanbuild.mk

+2 −2
Original line number Diff line number Diff line
@@ -281,13 +281,13 @@ endif 
dataclean: FILES := $(dataclean_files)

dataclean:

	$(hide) rm -rf $(FILES)

	@echo -e ${CL_GRN}"Deleted emulator userdata images."${CL_RST}

	@echo "Deleted emulator userdata images."



.PHONY: installclean

installclean: FILES := $(installclean_files)

installclean: dataclean

	$(hide) rm -rf $(FILES)

	@echo -e ${CL_GRN}"Deleted images and staging directories."${CL_RST}

	@echo "Deleted images and staging directories."



.PHONY: objclean

objclean: FILES := $(objclean_files)

core/definitions.mk

+31 −31
Original line number Diff line number Diff line
@@ -1206,7 +1206,7 @@ endef 
###########################################################



define transform-cpp-to-o

@echo -e ${CL_GRN}"target $(PRIVATE_ARM_MODE) C++:"${CL_RST}" $(PRIVATE_MODULE) <= $<"

@echo "target $(PRIVATE_ARM_MODE) C++:"" $(PRIVATE_MODULE) <= $<"

@mkdir -p $(dir $@)

$(hide) $(RELATIVE_PWD) $(PRIVATE_CXX) \

	$(addprefix -I , $(PRIVATE_C_INCLUDES)) \
@@ -1259,7 +1259,7 @@ $(hide) $(RELATIVE_PWD) $(PRIVATE_CC) \ 
endef



define transform-c-to-o-no-deps

@echo -e ${CL_GRN}"target $(PRIVATE_ARM_MODE) C:"${CL_RST}" $(PRIVATE_MODULE) <= $<"

@echo "target $(PRIVATE_ARM_MODE) C:"" $(PRIVATE_MODULE) <= $<"

$(call transform-c-or-s-to-o-no-deps, \

    $(PRIVATE_CFLAGS) \

    $(PRIVATE_CONLYFLAGS) \
@@ -1268,7 +1268,7 @@ $(call transform-c-or-s-to-o-no-deps, \ 
endef



define transform-s-to-o-no-deps

@echo -e ${CL_GRN}"target asm:"${CL_RST}" $(PRIVATE_MODULE) <= $<"

@echo "target asm:"" $(PRIVATE_MODULE) <= $<"

$(call transform-c-or-s-to-o-no-deps, $(PRIVATE_ASFLAGS))

endef
@@ -1299,7 +1299,7 @@ endef 
###########################################################



define transform-m-to-o-no-deps

@echo -e ${CL_GRN}"target ObjC:"${CL_RST}" $(PRIVATE_MODULE) <= $<"

@echo "target ObjC:"" $(PRIVATE_MODULE) <= $<"

$(call transform-c-or-s-to-o-no-deps, $(PRIVATE_CFLAGS) $(PRIVATE_DEBUG_CFLAGS))

endef
@@ -1313,7 +1313,7 @@ endef 
###########################################################



define transform-host-cpp-to-o

@echo -e ${CL_YLW}"$($(PRIVATE_PREFIX)DISPLAY) C++:"${CL_RST}" $(PRIVATE_MODULE) <= $<"

@echo "$($(PRIVATE_PREFIX)DISPLAY) C++:"" $(PRIVATE_MODULE) <= $<"

@mkdir -p $(dir $@)

$(hide) $(RELATIVE_PWD) $(PRIVATE_CXX) \

	$(addprefix -I , $(PRIVATE_C_INCLUDES)) \
@@ -1364,12 +1364,12 @@ $(hide) $(RELATIVE_PWD) $(PRIVATE_CC) \ 
endef



define transform-host-c-to-o-no-deps

@echo -e ${CL_YLW}"$($(PRIVATE_PREFIX)DISPLAY) C:"${CL_RST}" $(PRIVATE_MODULE) <= $<"

@echo "$($(PRIVATE_PREFIX)DISPLAY) C:"" $(PRIVATE_MODULE) <= $<"

$(call transform-host-c-or-s-to-o-no-deps, $(PRIVATE_CFLAGS) $(PRIVATE_CONLYFLAGS) $(PRIVATE_DEBUG_CFLAGS))

endef



define transform-host-s-to-o-no-deps

@echo -e ${CL_YLW}"$($(PRIVATE_PREFIX)DISPLAY) asm:"${CL_RST}" $(PRIVATE_MODULE) <= $<"

@echo "$($(PRIVATE_PREFIX)DISPLAY) asm:"" $(PRIVATE_MODULE) <= $<"

$(call transform-host-c-or-s-to-o-no-deps, $(PRIVATE_ASFLAGS))

endef
@@ -1388,7 +1388,7 @@ endef 
###########################################################



define transform-host-m-to-o-no-deps

@echo -e ${CL_YLW}"$($(PRIVATE_PREFIX)DISPLAY) ObjC:"${CL_RST}" $(PRIVATE_MODULE) <= $<"

@echo "$($(PRIVATE_PREFIX)DISPLAY) ObjC:"" $(PRIVATE_MODULE) <= $<"

$(call transform-host-c-or-s-to-o-no-deps, $(PRIVATE_CFLAGS) $(PRIVATE_DEBUG_CFLAGS))

endef
@@ -1528,7 +1528,7 @@ endef 
# Explicitly delete the archive first so that ar doesn't

# try to add to an existing archive.

define transform-o-to-static-lib

@echo -e ${CL_GRN}"target StaticLib:"${CL_RST}" $(PRIVATE_MODULE) ($@)"

@echo "target StaticLib:"" $(PRIVATE_MODULE) ($@)"

@mkdir -p $(dir $@)

@rm -f $@

$(extract-and-include-target-whole-static-libs)
@@ -1576,7 +1576,7 @@ endef 
# Explicitly delete the archive first so that ar doesn't

# try to add to an existing archive.

define transform-host-o-to-static-lib

@echo -e ${CL_YLW}"$($(PRIVATE_PREFIX)DISPLAY) StaticLib:"${CL_RST}" $(PRIVATE_MODULE) ($@)"

@echo "$($(PRIVATE_PREFIX)DISPLAY) StaticLib:"" $(PRIVATE_MODULE) ($@)"

@mkdir -p $(dir $@)

@rm -f $@

$(extract-and-include-host-whole-static-libs)
@@ -1620,13 +1620,13 @@ endef 
endif



define transform-host-o-to-shared-lib

@echo -e ${CL_YLW}"$($(PRIVATE_PREFIX)DISPLAY) SharedLib:"${CL_RST}" $(PRIVATE_MODULE) ($@)"

@echo "$($(PRIVATE_PREFIX)DISPLAY) SharedLib:"" $(PRIVATE_MODULE) ($@)"

@mkdir -p $(dir $@)

$(transform-host-o-to-shared-lib-inner)

endef



define transform-host-o-to-package

@echo -e ${CL_YLW}"$($(PRIVATE_PREFIX)DISPLAY) Package:"${CL_RST}" $(PRIVATE_MODULE) ($@)"

@echo "$($(PRIVATE_PREFIX)DISPLAY) Package:"" $(PRIVATE_MODULE) ($@)"

@mkdir -p $(dir $@)

$(transform-host-o-to-shared-lib-inner)

endef
@@ -1662,7 +1662,7 @@ $(hide) $(PRIVATE_CXX) \ 
endef



define transform-o-to-shared-lib

@echo -e ${CL_GRN}"target SharedLib:"${CL_RST}" $(PRIVATE_MODULE) ($@)"

@echo "target SharedLib:"" $(PRIVATE_MODULE) ($@)"

@mkdir -p $(dir $@)

$(transform-o-to-shared-lib-inner)

endef
@@ -1677,14 +1677,14 @@ ifneq ($(TARGET_BUILD_VARIANT),user) 
endif



define transform-to-stripped

@echo -e ${CL_GRN}"target Strip:"${CL_RST}" $(PRIVATE_MODULE) ($@)"

@echo "target Strip:"" $(PRIVATE_MODULE) ($@)"

@mkdir -p $(dir $@)

$(hide) $(PRIVATE_STRIP) --strip-all $< -o $@ \

  $(if $(PRIVATE_NO_DEBUGLINK),,$(TARGET_STRIP_EXTRA))

endef



define transform-to-stripped-keep-symbols

@echo -e ${CL_GRN}"target Strip (keep symbols):"${CL_RST}" $(PRIVATE_MODULE) ($@)"

@echo "target Strip (keep symbols):"" $(PRIVATE_MODULE) ($@)"

@mkdir -p $(dir $@)

$(hide) $(PRIVATE_OBJCOPY) \

    `$(PRIVATE_READELF) -S $< | awk '/.debug_/ {print "-R " $$2}' | xargs` \
@@ -1733,7 +1733,7 @@ $(hide) $(PRIVATE_CXX) -pie \ 
endef



define transform-o-to-executable

@echo -e ${CL_GRN}"target Executable:"${CL_RST}" $(PRIVATE_MODULE) ($@)"

@echo "target Executable:"" $(PRIVATE_MODULE) ($@)"

@mkdir -p $(dir $@)

$(transform-o-to-executable-inner)

endef
@@ -1776,7 +1776,7 @@ $(hide) $(PRIVATE_CXX) \ 
endef



define transform-o-to-static-executable

@echo -e ${CL_GRN}"target StaticExecutable:"${CL_RST}" $(PRIVATE_MODULE) ($@)"

@echo "target StaticExecutable:"" $(PRIVATE_MODULE) ($@)"

@mkdir -p $(dir $@)

$(transform-o-to-static-executable-inner)

endef
@@ -1822,7 +1822,7 @@ endef 
endif



define transform-host-o-to-executable

@echo -e ${CL_YLW}"$($(PRIVATE_PREFIX)DISPLAY) Executable:"${CL_RST}" $(PRIVATE_MODULE) ($@)"

@echo "$($(PRIVATE_PREFIX)DISPLAY) Executable:"" $(PRIVATE_MODULE) ($@)"

@mkdir -p $(dir $@)

$(transform-host-o-to-executable-inner)

endef
@@ -2056,10 +2056,10 @@ $(hide) if [ -s $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq ] ; the 
    \@$(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq \

    2>$(PRIVATE_CLASS_INTERMEDIATES_DIR)/stderr \

    && ( [ -s $(PRIVATE_CLASS_INTERMEDIATES_DIR)/stderr ] && \

    echo -e ${CL_YLW}"`cat $(PRIVATE_CLASS_INTERMEDIATES_DIR)/stderr`"${CL_RST} 1>&2; \

    echo "`cat $(PRIVATE_CLASS_INTERMEDIATES_DIR)/stderr`" 1>&2; \

    rm -f $(PRIVATE_CLASS_INTERMEDIATES_DIR)/stderr ) \

    || ( [ -s $(PRIVATE_CLASS_INTERMEDIATES_DIR)/stderr ] && \

    echo -e ${CL_RED}"`cat $(PRIVATE_CLASS_INTERMEDIATES_DIR)/stderr`"${CL_RST} 1>&2; \

    echo "`cat $(PRIVATE_CLASS_INTERMEDIATES_DIR)/stderr`" 1>&2; \

    rm -rf $(PRIVATE_CLASS_INTERMEDIATES_DIR); exit 41 ) \

fi

$(if $(PRIVATE_JAVA_LAYERS_FILE), $(hide) build/tools/java-layers.py \
@@ -2089,7 +2089,7 @@ $(if $(PRIVATE_EXTRA_JAR_ARGS),$(call add-java-resources-to,$@)) 
endef



define transform-java-to-classes.jar

@echo -e ${CL_GRN}"target Java:"${CL_RST}" $(PRIVATE_MODULE) ($(PRIVATE_CLASS_INTERMEDIATES_DIR))"

@echo "target Java:"" $(PRIVATE_MODULE) ($(PRIVATE_CLASS_INTERMEDIATES_DIR))"

$(call compile-java,$(TARGET_JAVAC),$(PRIVATE_BOOTCLASSPATH))

endef
@@ -2540,7 +2540,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 -e ${CL_YLW}"$($(PRIVATE_PREFIX)DISPLAY) Java:"${CL_RST}" $(PRIVATE_MODULE) ($(PRIVATE_CLASS_INTERMEDIATES_DIR))"

@echo "$($(PRIVATE_PREFIX)DISPLAY) Java:"" $(PRIVATE_MODULE) ($(PRIVATE_CLASS_INTERMEDIATES_DIR))"

$(call compile-java,$(HOST_JAVAC),$(PRIVATE_BOOTCLASSPATH))

endef
@@ -2553,7 +2553,7 @@ endef 
# $(2): destination header

define copy-one-header

$(2): $(1)

	@echo -e ${CL_YLW}"Header:"${CL_RST}" $$@"

	@echo "Header:"" $$@"

	$$(copy-file-to-new-target-with-cp)

endef
@@ -2562,7 +2562,7 @@ endef 
# $(2): destination file

define copy-one-file

$(2): $(1) | $(ACP)

	@echo -e ${CL_YLW}"Copy:"${CL_RST}" $$@"

	@echo "Copy:"" $$@"

	$$(copy-file-to-target)

endef
@@ -2583,7 +2583,7 @@ endef 
# $(2): destination file, must end with .xml.

define copy-xml-file-checked

$(2): $(1) | $(ACP)

	@echo -e ${CL_YLW}"Copy xml:"${CL_RST}" $$@"

	@echo "Copy xml:"" $$@"

	$(hide) xmllint $$< >/dev/null  # Don't print the xml file to stdout.

	$$(copy-file-to-target)

endef
@@ -2641,19 +2641,19 @@ endef 


# Copy a prebuilt file to a target location.

define transform-prebuilt-to-target

@echo -e ${CL_CYN}"$(if $(PRIVATE_IS_HOST_MODULE),host,target) Prebuilt:"${CL_RST}" $(PRIVATE_MODULE) ($@)"

@echo "$(if $(PRIVATE_IS_HOST_MODULE),host,target) Prebuilt:"" $(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 -e ${CL_CYN}"$(if $(PRIVATE_IS_HOST_MODULE),host,target) Prebuilt APK:"${CL_RST}" $(PRIVATE_MODULE) ($@)"

@echo "$(if $(PRIVATE_IS_HOST_MODULE),host,target) Prebuilt APK:"" $(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 -e ${CL_CYN}"$(if $(PRIVATE_IS_HOST_MODULE),host,target) Prebuilt:"${CL_RST}" $(PRIVATE_MODULE) ($@)"

@echo "$(if $(PRIVATE_IS_HOST_MODULE),host,target) Prebuilt:"" $(PRIVATE_MODULE) ($@)"

$(copy-file-to-target-strip-comments)

endef
@@ -2672,8 +2672,8 @@ endef 
###########################################################

## Commands to call Proguard

###########################################################

@echo -e ${CL_CYN}"Copying:"${CL_RST}" $@"

@echo -e ${CL_GRN}"Proguard:"${CL_RST}" $@"

@echo "Copying:"" $@"

@echo "Proguard:"" $@"

define transform-jar-to-proguard

$(hide) $(PROGUARD) -injars $< -outjars $@ $(PRIVATE_PROGUARD_FLAGS) \

    $(addprefix -injars , $(PRIVATE_EXTRA_INPUT_JAR))
@@ -2684,7 +2684,7 @@ endef 
###########################################################



define transform-generated-source

@echo -e ${CL_GRN}"target Generated:"${CL_RST}" $(PRIVATE_MODULE) <= $<"

@echo "target Generated:"" $(PRIVATE_MODULE) <= $<"

@mkdir -p $(dir $@)

$(hide) $(PRIVATE_CUSTOM_TOOL)

endef