commit 05783c053441e0b149a594a670665ffb2661b752
author Kiyoung Kim <kiyoungkim@google.com> Sun Oct 06 23:02:16 2019 -0700
committer android-build-merger <android-build-merger@google.com> Sun Oct 06 23:02:16 2019 -0700
tree 62d037365798eeb9bf618e708850abc6b76d3cb4
parent dda2ee33f83f6dc35a89989b9aacf03f9b5acea9
parent 09ec1c8e2e4ef26a9e7709e5da0317fd0f859b3e

Merge "Temporary add ld.config.txt build" am: f2098870c1
am: d4e55ce0f7

Change-Id: Id535dee878dc23b37d52e2861c8430fda14cbe1c

rootdir/Android.mk

diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index a814fb8..a705071 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -237,6 +237,9 @@
 
 # for VNDK enforced devices
 # This file will be replaced with dynamically generated one from system/linkerconfig
+LOCAL_MODULE_STEM := $(LOCAL_MODULE)
+LOCAL_SRC_FILES := etc/ld.config.txt
+include $(BUILD_PREBUILT)
 
 else ifeq ($(_enforce_vndk_lite_at_runtime),true)