From 4cd831d8f0b4e393f2ba6730b5a31e5ae9355914 Mon Sep 17 00:00:00 2001 From: Ulises Mendez Martinez Date: Wed, 22 Jul 2026 11:25:16 +0000 Subject: [PATCH] ANDROID: Makefile: Revert mixed-build-prefix hack Last references were removed in http://r.android.com/3552603 and http://r.android.com/3552602. Since mixed-build-prefix is no longer used, we can safely remove its definition and export. Bug: 205893923 Test: tools/bazel build //common-modules/virtual-device:virtual_device_x86_64 Change-Id: I467d7a01648bbd079640e645e09b9f5edbdee3b3 Signed-off-by: Ulises Mendez Martinez --- Makefile | 5 ----- scripts/Makefile.modpost | 2 -- 2 files changed, 7 deletions(-) diff --git a/Makefile b/Makefile index c086953cc4db..0d8f2891e8b6 100644 --- a/Makefile +++ b/Makefile @@ -162,12 +162,7 @@ $(if $(filter-out $(words $(required_mixed_files)), \ $(error KBUILD_MIXED_TREE=$(KBUILD_MIXED_TREE) doesn't contain $(required_mixed_files))) endif -mixed-build-prefix = $(if $(KBUILD_MIXED_TREE),$(KBUILD_MIXED_TREE)/) export KBUILD_MIXED_TREE -# This is a hack for kleaf to set mixed-build-prefix within the execution of a make rule, e.g. -# within __modinst_pre. -# TODO(b/205893923): Revert this hack once it is properly handled. -export mixed-build-prefix ifeq ("$(origin W)", "command line") KBUILD_EXTRA_WARN := $(W) diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost index 708aa3b855fa..c86367d061c9 100644 --- a/scripts/Makefile.modpost +++ b/scripts/Makefile.modpost @@ -38,8 +38,6 @@ __modpost: include $(objtree)/include/config/auto.conf include $(srctree)/scripts/Kbuild.include -mixed-build-prefix = $(if $(KBUILD_MIXED_TREE),$(KBUILD_MIXED_TREE)/) - MODPOST = $(objtree)/scripts/mod/modpost modpost-args = \