Merge "Only install to $OUT/apex for installable apexes" am: e3db7f6d38
am: e0aec36cbe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2065677 Change-Id: Id2a9c466e565842ab9b746169c8bfe6e5486ac4b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -388,7 +388,7 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) {
|
|||||||
|
|
||||||
imageDir := android.PathForModuleOut(ctx, "image"+suffix)
|
imageDir := android.PathForModuleOut(ctx, "image"+suffix)
|
||||||
|
|
||||||
installSymbolFiles := !ctx.Config().KatiEnabled() || a.ExportedToMake()
|
installSymbolFiles := (!ctx.Config().KatiEnabled() || a.ExportedToMake()) && a.installable()
|
||||||
|
|
||||||
// b/140136207. When there are overriding APEXes for a VNDK APEX, the symbols file for the overridden
|
// 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>
|
// APEX and the overriding APEX will have the same installation paths at /apex/com.android.vndk.v<ver>
|
||||||
|
Reference in New Issue
Block a user