From ba0368ed3aa4d52064fcd1bdf8de47acd833b754 Mon Sep 17 00:00:00 2001 From: Elliot Berman Date: Tue, 26 Jan 2021 11:29:35 -0800 Subject: [PATCH] Revert "ANDROID: kbuild: handle excessively long argument lists" This reverts commit f50aeaf27cfb ("ANDROID: kbuild: handle excessively long argument lists") since it causes regression in how kbuild handles dependencies. Bug: 175420575 Change-Id: I5ed5e883e7b0886dee8491dd888aa82d42452e79 Signed-off-by: Elliot Berman --- scripts/Makefile.build | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 1d969811c691..17d04ea62cd1 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -440,15 +440,10 @@ quiet_cmd_link_multi-m = AR [M] $@ cmd_link_multi-m = \ $(cmd_update_lto_symversions); \ rm -f $@; \ - $(file >$@.in,$(filter %.o,$^)) \ - $(AR) cDPrsT $@ @$@.in; \ - rm -f $@.in + $(AR) cDPrsT $@ $(filter %.o,$^) else quiet_cmd_link_multi-m = LD [M] $@ -cmd_link_multi-m = \ - $(file >$@.in,$(filter %.o,$^)) \ - $(LD) $(ld_flags) -r -o $@ @$@.in; \ - rm -f $@.in + cmd_link_multi-m = $(LD) $(ld_flags) -r -o $@ $(filter %.o,$^) endif $(multi-used-m): FORCE