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
This commit is contained in:
parent
f1c1006eca
commit
c3e2c86caf
|
@ -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() {
|
||||
if ctx.Device() {
|
||||
binary.installSymlinkToRuntimeApex(ctx, file)
|
||||
}
|
||||
binary.baseInstaller.subDir = "bootstrap"
|
||||
}
|
||||
binary.baseInstaller.install(ctx, file)
|
||||
|
|
|
@ -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() {
|
||||
if ctx.Device() {
|
||||
library.installSymlinkToRuntimeApex(ctx, file)
|
||||
}
|
||||
library.baseInstaller.subDir = "bootstrap"
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue