Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02730b93 authored by Colin Cross's avatar Colin Cross
Browse files

Only install to $OUT/apex for installable apexes 

When coverage is enabled there are two variants of the apex, one
installable and one not installable.  Don't try to install files
files to $OUT/apex for the non-installable variant.

Bug: 217453046
Test: m NATIVE_COVERAGE_PATHS="*" NATIVE_COVERAGE_EXCLUDE_PATHS="art bionic/libc device" CLANG_COVERAGE=true USE_HOST_MUSL=true com.android.runtime
Change-Id: I23e58c811ff943b9d5dec025fa619c8db835b29c
parent ef4a5a30

apex/builder.go

+1 −1
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) { 


	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

	// APEX and the overriding APEX will have the same installation paths at /apex/com.android.vndk.v<ver>