diff options
| author | 2020-11-30 14:42:14 +0900 | |
|---|---|---|
| committer | 2020-12-02 11:33:54 +0900 | |
| commit | 4098c7eddfd488fe77508bcde0bbae55b8574e2d (patch) | |
| tree | f89960f1c101e17a68d3597e98d94c278a65fe21 /apex/apex.go | |
| parent | e76ec1cbebb2bec7862fd49b01b65b9b2e3ad63b (diff) | |
Add linkerconfig to Runtime APEX
Add linkerconfig to Runtime APEX module.
Bug: 165769179
Test: Cuttlefish boot succeeded
Change-Id: I31c4bfa2ce88b64d7100f227ec289416db253b13
Diffstat (limited to 'apex/apex.go')
| -rw-r--r-- | apex/apex.go | 4 |
1 files changed, 3 insertions, 1 deletions
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 } |