StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add linkerconfig to Runtime APEX" am: 2ba87f466c am: 41e45d90b3

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1513630

Change-Id: Idf724126083d36da8c412bd1eb7c782ba0d5e372
This commit is contained in:
Kiyoung Kim
2020-12-04 02:04:52 +00:00
committed by Automerger Merge Worker
parent 238bddc7d9 41e45d90b3
commit aa7703d34b
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apex/apex.go
View File

@@ -2016,7 +2016,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
}