summaryrefslogtreecommitdiffstats
path: root/rootdir
diff options
context:
space:
mode:
authorJiyong Park <jiyong@google.com>2018-06-13 16:43:09 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-06-13 16:43:09 -0700
commit4ebda908def10427df7d7d0c06e2e3c32f078bd1 (patch)
tree78e7decda5a2cdc27e44a6c8d4ebeb7b55e19774 /rootdir
parentee888fe1d3baf7eb8ab85661a96e06bb0a6191d8 (diff)
parent011ee12b1def041d71621da7740bf5784a5e6488 (diff)
downloadsystem_core-4ebda908def10427df7d7d0c06e2e3c32f078bd1.tar.gz
system_core-4ebda908def10427df7d7d0c06e2e3c32f078bd1.tar.bz2
system_core-4ebda908def10427df7d7d0c06e2e3c32f078bd1.zip
Shared libs are supported in recovery mode
am: 011ee12b1d Change-Id: I867dbafecf11215b82d952c532774cdf12c6e782
Diffstat (limited to 'rootdir')
-rw-r--r--rootdir/Android.mk10
-rw-r--r--rootdir/etc/ld.config.recovery.txt9
2 files changed, 19 insertions, 0 deletions
diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index 80e068af7..3d0325d55 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -309,6 +309,16 @@ _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)/etc
+LOCAL_MODULE_STEM := ld.config.txt
+include $(BUILD_PREBUILT)
+
+#######################################
# llndk.libraries.txt
include $(CLEAR_VARS)
LOCAL_MODULE := llndk.libraries.txt
diff --git a/rootdir/etc/ld.config.recovery.txt b/rootdir/etc/ld.config.recovery.txt
new file mode 100644
index 000000000..5d6c01a85
--- /dev/null
+++ b/rootdir/etc/ld.config.recovery.txt
@@ -0,0 +1,9 @@
+# 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}