commit a7d36f38fa9c6aed04f8936dd7a6b4b3a91c565d
author Kiyoung Kim <kiyoungkim@google.com> Sun Oct 06 23:08:47 2019 -0700
committer android-build-merger <android-build-merger@google.com> Sun Oct 06 23:08:47 2019 -0700
tree 62d037365798eeb9bf618e708850abc6b76d3cb4
parent 9b507cd6c5bc7364ef6e88c4c4c8eda35661ca9c
parent 05783c053441e0b149a594a670665ffb2661b752

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

Change-Id: I3543aa744583a9cafbac31a6acab0b26b39edb36

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)