From bec0fb162f1ee31d7e7328ff003503264708d13b Mon Sep 17 00:00:00 2001 From: Thomas Makin Date: Fri, 10 Oct 2025 00:53:57 -0500 Subject: [PATCH] kernel: Prevent creating any files in kernel platform source tree Original command redirected output to the android build out. However, a handful of configs were still generated in the source tree. Set the bazel flag output_root to redirect these configs to the android build out as well. Change-Id: I5181270b773a49d74eab00b89eaaf1187471a144 --- build/soong/Android.bp | 2 +- build/tasks/kernel.mk | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/build/soong/Android.bp b/build/soong/Android.bp index 6b27c940..a36954b3 100644 --- a/build/soong/Android.bp +++ b/build/soong/Android.bp @@ -23,7 +23,7 @@ lineage_generator { // The headers make command cmd: "if [ -n \"$(TARGET_KERNEL_PLATFORM_TARGET)\" ]; then " + " pushd $(KERNEL_PATH); " + - " ./tools/bazel --output_user_root=$(KERNEL_BUILD_OUT_PREFIX)$(genDir)/bazel-out run --experimental_convenience_symlinks=ignore --cpu=$(KERNEL_ARCH) //$(TARGET_KERNEL_SOURCE):$(TARGET_KERNEL_PLATFORM_TARGET)_uapi_headers_dist -- --destdir=$(KERNEL_BUILD_OUT_PREFIX)$(genDir); " + + " ./tools/bazel --output_user_root=$(KERNEL_BUILD_OUT_PREFIX)$(genDir)/bazel-out --output_root=$(KERNEL_BUILD_OUT_PREFIX)$(genDir)/bazel-out run --experimental_convenience_symlinks=ignore --cpu=$(KERNEL_ARCH) //$(TARGET_KERNEL_SOURCE):$(TARGET_KERNEL_PLATFORM_TARGET)_uapi_headers_dist -- --destdir=$(KERNEL_BUILD_OUT_PREFIX)$(genDir); " + " popd; " + " gzip -d $(KERNEL_BUILD_OUT_PREFIX)$(genDir)/kernel-uapi-headers.tar.gz; " + " tar -xf $(KERNEL_BUILD_OUT_PREFIX)$(genDir)/kernel-uapi-headers.tar -C $(KERNEL_BUILD_OUT_PREFIX)$(genDir); " + diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk index 2ed13bd6..3f736c31 100644 --- a/build/tasks/kernel.mk +++ b/build/tasks/kernel.mk @@ -716,9 +716,8 @@ KERNEL_PATH := $(abspath $(BUILD_TOP)/../kernel-$(TARGET_KERNEL_VERSION)) $(TARGET_PREBUILT_INT_KERNEL): $(DEPMOD) $(KERNEL_MODULES_PARTITION_FILE_LIST) $(SYSTEM_KERNEL_MODULES_PARTITION_FILE_LIST) @echo "Building $(BOARD_KERNEL_IMAGE_NAME)" @mkdir -p $(KERNEL_OUT) - @rm -rf $(KERNEL_PATH)/out $(hide) cd $(KERNEL_PATH) && python3 .repo/repo/repo manifest -o - -r > $(abspath $(KERNEL_OUT))/manifest.xml - $(hide) cd $(KERNEL_PATH) && ./tools/bazel --output_user_root=$(abspath $(KERNEL_OUT)/bazel-out) run --experimental_convenience_symlinks=ignore --cpu=$(KERNEL_ARCH) --repo_manifest $(abspath $(KERNEL_PATH)):$(abspath $(KERNEL_OUT)/manifest.xml) --config=stamp //$(KERNEL_SRC):$(TARGET_KERNEL_PLATFORM_TARGET)_dist -- --destdir=$(abspath $(KERNEL_OUT)) + $(hide) cd $(KERNEL_PATH) && ./tools/bazel --output_user_root=$(abspath $(KERNEL_OUT)/bazel-out) --output_root=$(abspath $(KERNEL_OUT)/bazel-out) run --experimental_convenience_symlinks=ignore --cpu=$(KERNEL_ARCH) --repo_manifest $(abspath $(KERNEL_PATH)):$(abspath $(KERNEL_OUT)/manifest.xml) --config=stamp //$(KERNEL_SRC):$(TARGET_KERNEL_PLATFORM_TARGET)_dist -- --destdir=$(abspath $(KERNEL_OUT)) $(if $(BOOT_KERNEL_MODULES),\ $(call build-image-kernel-modules-lineage,$(addprefix $(KERNEL_OUT)/,$(BOOT_KERNEL_MODULES)),$(KERNEL_VENDOR_RAMDISK_MODULES_OUT),,$(KERNEL_VENDOR_RAMDISK_DEPMOD_STAGING_DIR),$(KERNEL_VENDOR_RAMDISK_KERNEL_MODULES_LOAD),,,)\ )