From c3e2c86caf8cc3702bf65ce9f138c1e56480aea5 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Sat, 16 Mar 2019 01:10:08 +0900 Subject: [PATCH] Install symlink to the runtime APEX only for device Host does not need the symlink. It also broke master-art-host targets. Test: ALLOW_MISSING_DEPENDENCIES=true DIST_DIR=~/temp ./art/tools/dist_linux_bionic.sh -j50 showcommands com.android.runtime.host Change-Id: Ie8e02553c5a1b6cd5afebd73a64268d2950fc18e --- cc/binary.go | 4 +++- cc/library.go | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cc/binary.go b/cc/binary.go index 995294330..cae1739b8 100644 --- a/cc/binary.go +++ b/cc/binary.go @@ -437,7 +437,9 @@ func (binary *binaryDecorator) install(ctx ModuleContext, file android.Path) { // The original path becomes a symlink to the corresponding file in the // runtime APEX. if isBionic(ctx.baseModuleName()) && ctx.Arch().Native && ctx.apexName() == "" && !ctx.inRecovery() { - binary.installSymlinkToRuntimeApex(ctx, file) + if ctx.Device() { + binary.installSymlinkToRuntimeApex(ctx, file) + } binary.baseInstaller.subDir = "bootstrap" } binary.baseInstaller.install(ctx, file) diff --git a/cc/library.go b/cc/library.go index 6404906cb..5df511294 100644 --- a/cc/library.go +++ b/cc/library.go @@ -920,7 +920,9 @@ func (library *libraryDecorator) install(ctx ModuleContext, file android.Path) { // The original path becomes a symlink to the corresponding file in the // runtime APEX. if isBionic(ctx.baseModuleName()) && !library.buildStubs() && ctx.Arch().Native && !ctx.inRecovery() { - library.installSymlinkToRuntimeApex(ctx, file) + if ctx.Device() { + library.installSymlinkToRuntimeApex(ctx, file) + } library.baseInstaller.subDir = "bootstrap" } }