From 9b96418dfefa251409f17495cc0f9b093f8b4897 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Wed, 26 Feb 2020 18:27:19 +0900 Subject: [PATCH] No symlink for host APEXes Symlinking doesn't make sense for host APEXes. Bug: 150255435 Test: m com.android.art.host and inspect the built APEX; there is no symlink. Change-Id: I28492dfaaef471117a430be05255fbef76e557b0 --- apex/apex.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/apex/apex.go b/apex/apex.go index 712afe415..992137abf 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -2328,6 +2328,11 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) { a.linkToSystemLib = false } + // We also don't want the optimization for host APEXes, because it doesn't make sense. + if ctx.Host() { + a.linkToSystemLib = false + } + // prepare apex_manifest.json a.buildManifest(ctx, provideNativeLibs, requireNativeLibs)