From 02730b93b2e7d16d186527d4df47cfd702e382e6 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Mon, 18 Apr 2022 17:42:27 -0700 Subject: [PATCH] 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 --- apex/builder.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apex/builder.go b/apex/builder.go index 293f388ea..abbf8ad25 100644 --- a/apex/builder.go +++ b/apex/builder.go @@ -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