commit f8f384c69722e6a50fcba8aa8e20787571f35011
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Feb 21 00:07:18 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Feb 21 00:07:18 2020 +0000
tree 462ea618eea2c83befd6d815a6843830aeef3b4f
parent 787d012eacbd111f1605835fb9647869efca7109
parent 9ed719e16757d203e450fa3ca63761e7731652e1

Merge "Remove ld.config.txt from bionic APEX" am: 9ed719e167

Change-Id: I0dc4f91f1ef102faca6dec8beb528836108e550d

apex/Android.bp

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",
 }

apex/ld.config.txt

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]