From 3e17899f88fbb6e734a807791fe1d54e42c83e1a Mon Sep 17 00:00:00 2001
From: Matthias Maennich <maennich@google.com>
Date: Thu, 1 Jul 2021 14:40:18 +0100
Subject: [PATCH] ANDROID: build.configs: migrate away from CC_LD_ARG

... use TOOL_ARGS instead.

Bug: 192548924
Signed-off-by: Matthias Maennich <maennich@google.com>
Change-Id: I5a6eff9423c2c30a7c402f3257d1c1049d2fc9d1
---
 build.config.gki_kasan   | 2 +-
 build.config.gki_kprobes | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.config.gki_kasan b/build.config.gki_kasan
index ace2f87a613b..6d9de7ed8a40 100644
--- a/build.config.gki_kasan
+++ b/build.config.gki_kasan
@@ -17,6 +17,6 @@ function update_kasan_config() {
          -d CFI_CLANG \
          -d SHADOW_CALL_STACK
     (cd ${OUT_DIR} && \
-     make ${CC_LD_ARG} O=${OUT_DIR} olddefconfig)
+     make ${TOOL_ARGS} O=${OUT_DIR} olddefconfig)
 }
 
diff --git a/build.config.gki_kprobes b/build.config.gki_kprobes
index d4a7e7ae9cd4..f1c6cf785766 100644
--- a/build.config.gki_kprobes
+++ b/build.config.gki_kprobes
@@ -15,6 +15,6 @@ function update_kprobes_config() {
          -e CONFIG_CHECKPOINT_RESTORE \
          -d CONFIG_RANDOMIZE_BASE
     (cd ${OUT_DIR} && \
-     make ${CC_LD_ARG} O=${OUT_DIR} olddefconfig)
+     make ${TOOL_ARGS} O=${OUT_DIR} olddefconfig)
 }