ANDROID: build.configs: migrate away from CC_LD_ARG

metti · myxoid · commit d870ecaadb22 · 2021-07-02T09:50:13.000Z
... use TOOL_ARGS instead.

Bug: 192548924
Signed-off-by: Matthias Maennich &lt;maennich@google.com&gt;
Change-Id: I5a6eff9423c2c30a7c402f3257d1c1049d2fc9d1
diff --git a/build.config.gki_kasan b/build.config.gki_kasan
@@ -16,6 +16,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
@@ -14,6 +14,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)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,6 @@ function update_kasan_config() {`
`16`	`16`	`-d CFI_CLANG \`
`17`	`17`	`-d SHADOW_CALL_STACK`
`18`	`18`	`(cd ${OUT_DIR} && \`
`19`		`- make ${CC_LD_ARG} O=${OUT_DIR} olddefconfig)`
	`19`	`+ make ${TOOL_ARGS} O=${OUT_DIR} olddefconfig)`
`20`	`20`	`}`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,6 @@ function update_kprobes_config() {`
`14`	`14`	`-e CONFIG_CHECKPOINT_RESTORE \`
`15`	`15`	`-d CONFIG_RANDOMIZE_BASE`
`16`	`16`	`(cd ${OUT_DIR} && \`
`17`		`- make ${CC_LD_ARG} O=${OUT_DIR} olddefconfig)`
	`17`	`+ make ${TOOL_ARGS} O=${OUT_DIR} olddefconfig)`
`18`	`18`	`}`
`19`	`19`