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

Merge "Prevent GKI APEXes to write to $OUT/apex." am: 222de6f13b

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

Change-Id: I05c67730b95f382667208d2b2a2e2ab19a77e1d5
This commit is contained in:
Yifan Hong
2020-07-31 00:03:56 +00:00
committed by Automerger Merge Worker
parent 8fe6b9bc06 222de6f13b
commit 2eda377fe7
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apex/androidmk.go
View File

@@ -50,6 +50,11 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, apexBundleName, apexName, mo
return moduleNames
}
// b/162366062. Prevent GKI APEXes to emit make rules to avoid conflicts.
if strings.HasPrefix(apexName, "com.android.gki.") && apexType != flattenedApex {
return moduleNames
}
// b/140136207. When there are overriding APEXes for a VNDK APEX, the symbols file for the overridden
// APEX and the overriding APEX will have the same installation paths at /apex/com.android.vndk.v<ver>
// as their apexName will be the same. To avoid the path conflicts, skip installing the symbol files