diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-03-18 22:23:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-03-18 22:23:06 +0000 |
| commit | c743c37e92a7af54dba79744fd6fb5e5ec1de961 (patch) | |
| tree | ab26cc49628655ae70e42beb9a97f1aedd3770fb /cc | |
| parent | cd2e52870a89494eb0105d77e2977ac259de4a0a (diff) | |
| parent | c3e2c86caf8cc3702bf65ce9f138c1e56480aea5 (diff) | |
| download | build_soong-c743c37e92a7af54dba79744fd6fb5e5ec1de961.tar.gz build_soong-c743c37e92a7af54dba79744fd6fb5e5ec1de961.tar.bz2 build_soong-c743c37e92a7af54dba79744fd6fb5e5ec1de961.zip | |
Merge "Install symlink to the runtime APEX only for device"
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/binary.go | 4 | ||||
| -rw-r--r-- | cc/library.go | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/cc/binary.go b/cc/binary.go index 99529433..cae1739b 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 6404906c..5df51129 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" } } |