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

Commit 6de1a4a2 authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Merge "Move definition of dist-for-goals before call." am: 80ef0a21 am: f2458a5d 

Original change: https://android-review.googlesource.com/c/platform/build/+/1128914

Change-Id: Ia3736984d5679d017b254a09f86130ffe6df7a68
parents 6a3041d8 f2458a5d

core/config.mk

+7 −0
Original line number Diff line number Diff line
@@ -22,6 +22,13 @@ BUILD_SYSTEM_COMMON :=$= build/make/common 


include $(BUILD_SYSTEM_COMMON)/core.mk



# -----------------------------------------------------------------

# Rules and functions to help copy important files to DIST_DIR

# when requested. This must be included once only, and must be included before

# soong_config (as soong_config calls make_vars-$(TARGET).mk, and soong may

# propagate calls to dist-for-goals there).

include $(BUILD_SYSTEM)/distdir.mk



# Mark variables that should be coming as environment variables from soong_ui

# as readonly

.KATI_READONLY := OUT_DIR TMPDIR BUILD_DATETIME_FILE

core/definitions.mk

+0 −5
Original line number Diff line number Diff line
@@ -3086,11 +3086,6 @@ endef 
## Other includes

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



# -----------------------------------------------------------------

# Rules and functions to help copy important files to DIST_DIR

# when requested.

include $(BUILD_SYSTEM)/distdir.mk



# Include any vendor specific definitions.mk file

-include $(TOPDIR)vendor/*/build/core/definitions.mk

-include $(TOPDIR)device/*/build/core/definitions.mk