tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Install symlink to the runtime APEX only for device" am: c743c37e92 am: 467fc4afa1

Browse source 
am: 0c0a3194b6

Change-Id: I7445ba140ddd2ddee89a8a5050ce1dd481d75bc3
This commit is contained in:
Jiyong Park 2019-03-18 15:48:55 -07:00 committed by android-build-merger
commit 638ec3a938
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cc/binary.go
View file

@ -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)

4
cc/library.go
View 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() {
library.installSymlinkToRuntimeApex(ctx, file)
if ctx.Device() {
library.installSymlinkToRuntimeApex(ctx, file)
}
library.baseInstaller.subDir = "bootstrap"
}
}