From 247a0be702c631419b4a4a1f7b24b19bd9fd3a0a Mon Sep 17 00:00:00 2001
From: Nick Desaulniers <ndesaulniers@google.com>
Date: Wed, 2 Jun 2021 16:21:03 -0700
Subject: [PATCH] Revert "ANDROID: Makefile: add compiler-rt dependency
 explicitly"

This reverts commit f14e5bfb39b776318133e00b8c066ce8a870e9ab.

Export this via HOSTLDFLAGS from build/ instead.

Bug: 65987925
Bug: 131098715
Bug: 135922132
Bug: 141693040
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
Change-Id: I0a272560d2f34748f4b73d0aff15b058023e9f05
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index cb2913a948bb..5f01e6b5e163 100644
--- a/Makefile
+++ b/Makefile
@@ -449,7 +449,7 @@ OBJCOPY		= llvm-objcopy
 OBJDUMP		= llvm-objdump
 READELF		= llvm-readelf
 STRIP		= llvm-strip
-KBUILD_HOSTLDFLAGS	+= -fuse-ld=lld --rtlib=compiler-rt
+KBUILD_HOSTLDFLAGS	+= -fuse-ld=lld
 else
 CC		= $(CROSS_COMPILE)gcc
 LD		= $(CROSS_COMPILE)ld