diff options
| author | Kiyoung Kim <kiyoungkim@google.com> | 2020-02-20 15:52:18 +0900 |
|---|---|---|
| committer | Kiyoung Kim <kiyoungkim@google.com> | 2020-02-20 16:05:27 +0900 |
| commit | bf40eac2eb51cb45b8b9027fb619637c71a53bdf (patch) | |
| tree | 0a606a8167327e5285edd2d3c20c0aac98fc22f7 /apex | |
| parent | 1c2efaaa11337ac83b35fb260af34eee83d6aa28 (diff) | |
| download | bionic-bf40eac2eb51cb45b8b9027fb619637c71a53bdf.tar.gz | |
Remove ld.config.txt from bionic APEX
Dynamic linker will use generated linker configuration in general. As
ld.config.txt file in the APEX module will not be used, we can remove
this to avoid confusion.
Bug: 149887007
Test: m -j passed
Test: Boot succeeded from cuttlefish and walleye
Change-Id: Iffd2113cf29055a7263eb3697547297639e9dc0c
Diffstat (limited to 'apex')
| -rw-r--r-- | apex/Android.bp | 8 | ||||
| -rw-r--r-- | apex/ld.config.txt | 8 |
2 files changed, 0 insertions, 16 deletions
diff --git a/apex/Android.bp b/apex/Android.bp index 4fbbec109..f62f930ed 100644 --- a/apex/Android.bp +++ b/apex/Android.bp @@ -14,13 +14,6 @@ apex_key { private_key: "com.android.runtime.pem", } -prebuilt_etc { - name: "com.android.runtime.ld.config.txt", - src: "ld.config.txt", - filename: "ld.config.txt", - installable: false, -} - apex { name: "com.android.runtime", compile_multilib: "both", @@ -38,7 +31,6 @@ apex { binaries: ["linker"], }, }, - prebuilts: ["com.android.runtime.ld.config.txt"], key: "com.android.runtime.key", certificate: ":com.android.runtime.certificate", } diff --git a/apex/ld.config.txt b/apex/ld.config.txt deleted file mode 100644 index dae883d7c..000000000 --- a/apex/ld.config.txt +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (C) 2019 The Android Open Source Project -# -# Bionic loader config file for the Runtime APEX. This is a minimal config to -# make the linker able to load itself as an executable (it just needs to exist). - -dir.runtime = /apex/com.android.runtime/bin/ - -[runtime] |