Remove ld.config.txt from adbd 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: Ic98aca819b5a4d0e0af4fe0ea25145a483aa7d53
diff --git a/adb/apex/Android.bp b/adb/apex/Android.bp
index a6b1e78..b62a8ff 100644
--- a/adb/apex/Android.bp
+++ b/adb/apex/Android.bp
@@ -8,7 +8,7 @@
native_shared_libs: ["libadbconnection_client"],
},
},
- prebuilts: ["com.android.adbd.init.rc", "com.android.adbd.ld.config.txt"],
+ prebuilts: ["com.android.adbd.init.rc"],
key: "com.android.adbd.key",
certificate: ":com.android.adbd.certificate",
@@ -30,13 +30,6 @@
}
prebuilt_etc {
- name: "com.android.adbd.ld.config.txt",
- src: "ld.config.txt",
- filename: "ld.config.txt",
- installable: false,
-}
-
-prebuilt_etc {
name: "com.android.adbd.init.rc",
src: "adbd.rc",
filename: "init.rc",