From 986e453d9ce3dede5b706b9f53b41d2b33cadb02 Mon Sep 17 00:00:00 2001
From: Kiyoung Kim <kiyoungkim@google.com>
Date: Thu, 19 Dec 2019 16:37:43 +0900
Subject: [PATCH] Remove ld.config.recovery.txt build

Remove ld.config.recovery.txt build as this will be replaced to be
generated from linkerconfig during build time.

Bug: 146414198
Test: m -j passed
Test: Checked linker config generated under recovery's system/etc
Change-Id: I0d2aa121973c4c99e68f44f4e76e4eab74dc2f95
---
 rootdir/Android.mk                 | 10 ----------
 rootdir/etc/ld.config.recovery.txt | 12 +++---------
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index 2dbdb6022..3ea06e5c0 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -272,16 +272,6 @@ endif  # ifeq ($(_enforce_vndk_lite_at_runtime),false)
 _enforce_vndk_at_runtime :=
 _enforce_vndk_lite_at_runtime :=
 
-#######################################
-# ld.config.txt for recovery
-include $(CLEAR_VARS)
-LOCAL_MODULE := ld.config.recovery.txt
-LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES := etc/ld.config.recovery.txt
-LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/system/etc
-LOCAL_MODULE_STEM := ld.config.txt
-include $(BUILD_PREBUILT)
-
 #######################################
 # sanitizer.libraries.txt
 include $(CLEAR_VARS)
diff --git a/rootdir/etc/ld.config.recovery.txt b/rootdir/etc/ld.config.recovery.txt
index 5d6c01a85..5c87843fb 100644
--- a/rootdir/etc/ld.config.recovery.txt
+++ b/rootdir/etc/ld.config.recovery.txt
@@ -1,9 +1,3 @@
-# Copyright (C) 2018 The Android Open Source Project
-#
-# Bionic loader config file for recovery mode
-#
-
-dir.recovery = /system/bin
-
-[recovery]
-namespace.default.search.paths = /system/${LIB}
+# This file is no longer in use.
+# Please update linker configuration generator instead.
+# You can find the code from /system/linkerconfig
\ No newline at end of file