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

Commit 5c133c67 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Restat make's kernel_version_for_uffd_gc.txt installation rule" into main am: d91ddc95 

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



Change-Id: I8c0bb0497e825333108c43923a46a00185bb8506
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 55e6672b d91ddc95

core/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -5441,7 +5441,8 @@ ifeq (default,$(ENABLE_UFFD_GC)) 
ifneq (,$(BUILT_KERNEL_VERSION_FILE))

$(BUILT_KERNEL_VERSION_FILE_FOR_UFFD_GC): $(BUILT_KERNEL_VERSION_FILE)

$(BUILT_KERNEL_VERSION_FILE_FOR_UFFD_GC):

	cp $(BUILT_KERNEL_VERSION_FILE) $(BUILT_KERNEL_VERSION_FILE_FOR_UFFD_GC)

	if ! cmp -s $(BUILT_KERNEL_VERSION_FILE) $@ ; then cp $(BUILT_KERNEL_VERSION_FILE) $@; fi

.KATI_RESTAT: $(BUILT_KERNEL_VERSION_FILE_FOR_UFFD_GC)

else

# We make this a warning rather than an error to avoid breaking too many builds. When it happens,

# we use a placeholder as the kernel version, which is consumed by uffd_gc_utils.py.