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

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

Merge "BUILT_KERNEL_CONFIGS_FILE built by linux tools" am: 37600f45 am: b7ee2672 

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



Change-Id: Ia7033607ff3bd1a2722870d4beb4d91e7a796084
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3dc4c355 b7ee2672

core/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -4781,8 +4781,8 @@ $(BUILT_KERNEL_CONFIGS_FILE): $(BOARD_KERNEL_CONFIG_FILE) 
$(BUILT_KERNEL_VERSION_FILE):

	echo $(BOARD_KERNEL_VERSION) > $@



$(call declare-0p-target,$(BUILT_KERNEL_CONFIGS_FILE))

$(call declare-0p-target,$(BUILT_KERNEL_VERSION_FILE))

$(call declare-license-metadata,$(BUILT_KERNEL_CONFIGS_FILE),SPDX-license-identifier-GPL-2.0-only,restricted,$(BUILD_SYSTEM)/LINUX_KERNEL_COPYING,"Kernel",kernel)

$(call declare-license-metadata,$(BUILT_KERNEL_VERSION_FILE),SPDX-license-identifier-GPL-2.0-only,restricted,$(BUILD_SYSTEM)/LINUX_KERNEL_COPYING,"Kernel",kernel)



my_board_extracted_kernel := true

endif # BOARD_KERNEL_VERSION
@@ -4807,7 +4807,7 @@ $(BUILT_KERNEL_CONFIGS_FILE): $(EXTRACT_KERNEL) $(firstword $(INSTALLED_KERNEL_T 
	  --output-configs $@ \

	  --output-release $(BUILT_KERNEL_VERSION_FILE)



$(call declare-0p-target,$(BUILT_KERNEL_CONFIGS_FILE))

$(call declare-license-metadata,$(BUILT_KERNEL_CONFIGS_FILE),SPDX-license-identifier-GPL-2.0-only,restricted,$(BUILD_SYSTEM)/LINUX_KERNEL_COPYING,"Kernel",kernel)



my_board_extracted_kernel := true

endif # INSTALLED_KERNEL_TARGET
@@ -4828,7 +4828,7 @@ $(BUILT_KERNEL_CONFIGS_FILE): \ 
	  --output-configs $@ \

	  --output-release $(BUILT_KERNEL_VERSION_FILE)



$(call declare-0p-target,$(BUILT_KERNEL_CONFIGS_FILE))

$(call declare-license-metadata,$(BUILT_KERNEL_CONFIGS_FILE),SPDX-license-identifier-GPL-2.0-only,restricted,$(BUILD_SYSTEM)/LINUX_KERNEL_COPYING,"Kernel",kernel)



my_board_extracted_kernel := true

endif # INSTALLED_BOOTIMAGE_TARGET