Merge "Remove ld.config.txt from bionic APEX" am: 9ed719e167 am: f8f384c697 am: 81103233b4
Change-Id: I486f4c9cc19a95ca49ed49ccf43903cfea7314e8
diff --git a/apex/Android.bp b/apex/Android.bp
index 4fbbec1..f62f930 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -14,13 +14,6 @@
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 @@
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 dae883d..0000000
--- 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]