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

Commit 974f7506 authored by Alexey Polyudov's avatar Alexey Polyudov Committed by Gerrit Code Review
Browse files

Merge "report correct build target class"

parents 340c0c57 8b540fd5

core/definitions.mk

+19 −19
Original line number Diff line number Diff line
@@ -1196,12 +1196,12 @@ endef 
ifneq (,$(filter 1 true,$(WITH_TIDY_ONLY)))

define transform-cpp-to-o

$(if $(PRIVATE_TIDY_CHECKS),

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

  @echo "$($(PRIVATE_PREFIX)DISPLAY) tidy $(PRIVATE_ARM_MODE) C++: $<"

  $(clang-tidy-cpp))

endef

else

define transform-cpp-to-o

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

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

@mkdir -p $(dir $@)

$(if $(PRIVATE_TIDY_CHECKS),$(clang-tidy-cpp))

$(hide) $(RELATIVE_PWD) $(PRIVATE_CXX) \
@@ -1245,12 +1245,12 @@ endef 
ifneq (,$(filter 1 true,$(WITH_TIDY_ONLY)))

define transform-c-to-o

$(if $(PRIVATE_TIDY_CHECKS),

  @echo "target tidy $(PRIVATE_ARM_MODE) C: $<"

  @echo "$($(PRIVATE_PREFIX)DISPLAY) tidy $(PRIVATE_ARM_MODE) C: $<"

  $(clang-tidy-c))

endef

else

define transform-c-to-o

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

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

@mkdir -p $(dir $@)

$(if $(PRIVATE_TIDY_CHECKS),$(clang-tidy-c))

$(hide) $(RELATIVE_PWD) $(PRIVATE_CC) \
@@ -1261,7 +1261,7 @@ endef 
endif



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

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

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

@mkdir -p $(dir $@)

$(RELATIVE_PWD) $(PRIVATE_CC) \

  $(call transform-c-or-s-to-o-compiler-args, $(PRIVATE_ASFLAGS)) \
@@ -1290,7 +1290,7 @@ endef 
###########################################################



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

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

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

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

endef
@@ -1549,7 +1549,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 "target StaticLib: $(PRIVATE_MODULE) ($@)"

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

@mkdir -p $(dir $@)

@rm -f $@

$(extract-and-include-target-whole-static-libs)
@@ -1702,7 +1702,7 @@ $(hide) $(PRIVATE_CXX) \ 
endef



define transform-o-to-shared-lib

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

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

@mkdir -p $(dir $@)

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

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



define transform-to-stripped

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

@echo "$($(PRIVATE_PREFIX)DISPLAY) 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-mini-debug-info

@echo "target Strip (mini debug info): $(PRIVATE_MODULE) ($@)"

@echo "$($(PRIVATE_PREFIX)DISPLAY) Strip (mini debug info): $(PRIVATE_MODULE) ($@)"

@mkdir -p $(dir $@)

$(hide) $(PRIVATE_NM) -D $< --format=posix --defined-only | awk '{ print $$1 }' | sort >$@.dynsyms

$(hide) $(PRIVATE_NM) $< --format=posix --defined-only | awk '{ if ($$2 == "T" || $$2 == "t" || $$2 == "D") print $$1 }' | sort >$@.funcsyms
@@ -1741,7 +1741,7 @@ $(hide) rm -f $@.dynsyms $@.funcsyms $@.keep_symbols $@.debug $@.mini_debuginfo. 
endef



define transform-to-stripped-keep-symbols

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

@echo "$($(PRIVATE_PREFIX)DISPLAY) Strip (keep symbols): $(PRIVATE_MODULE) ($@)"

@mkdir -p $(dir $@)

$(hide) $(PRIVATE_OBJCOPY) \

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



define pack-elf-relocations

@echo "target Pack Relocations: $(PRIVATE_MODULE) ($@)"

@echo "$($(PRIVATE_PREFIX)DISPLAY) Pack Relocations: $(PRIVATE_MODULE) ($@)"

$(copy-file-to-target)

$(hide) $(RELOCATION_PACKER) $@

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



define transform-o-to-executable

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

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

@mkdir -p $(dir $@)

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

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



define transform-o-to-static-executable

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

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

@mkdir -p $(dir $@)

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

endef
@@ -2052,7 +2052,7 @@ $(if $(PRIVATE_EXTRA_JAR_ARGS),$(call add-java-resources-to,$@)) 
endef



define transform-java-to-classes.jar

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

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

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

endef
@@ -2571,19 +2571,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 "$($(PRIVATE_PREFIX)DISPLAY) 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 "$(if $(PRIVATE_IS_HOST_MODULE),host,target) Prebuilt APK: $(PRIVATE_MODULE) ($@)"

@echo "$($(PRIVATE_PREFIX)DISPLAY) 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 "$(if $(PRIVATE_IS_HOST_MODULE),host,target) Prebuilt: $(PRIVATE_MODULE) ($@)"

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

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

endef
@@ -2630,7 +2630,7 @@ endef 
###########################################################



define transform-generated-source

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

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

@mkdir -p $(dir $@)

$(hide) $(PRIVATE_CUSTOM_TOOL)

endef