From 4098c7eddfd488fe77508bcde0bbae55b8574e2d Mon Sep 17 00:00:00 2001 From: Kiyoung Kim Date: Mon, 30 Nov 2020 14:42:14 +0900 Subject: Add linkerconfig to Runtime APEX Add linkerconfig to Runtime APEX module. Bug: 165769179 Test: Cuttlefish boot succeeded Change-Id: I31c4bfa2ce88b64d7100f227ec289416db253b13 --- apex/apex.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'apex/apex.go') diff --git a/apex/apex.go b/apex/apex.go index f127757b3..f8fb3550c 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -2013,7 +2013,9 @@ func (a *apexBundle) checkStaticLinkingToStubLibraries(ctx android.ModuleContext // The dynamic linker and crash_dump tool in the runtime APEX is the only // exception to this rule. It can't make the static dependencies dynamic // because it can't do the dynamic linking for itself. - if apexName == "com.android.runtime" && (fromName == "linker" || fromName == "crash_dump") { + // Same rule should be applied to linkerconfig, because it should be executed + // only with static linked libraries before linker is available with ld.config.txt + if apexName == "com.android.runtime" && (fromName == "linker" || fromName == "crash_dump" || fromName == "linkerconfig") { return false } -- cgit v1.2.3-59-g8ed1b