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
diff --git a/cc/binary.go b/cc/binary.go
index 9952943..cae1739 100644
--- a/cc/binary.go
+++ b/cc/binary.go
@@ -437,7 +437,9 @@
// 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)