Merge "Prevent GKI APEXes to write to $OUT/apex."
This commit is contained in:
commit
222de6f13b
1 changed files with 5 additions and 0 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue