diff options
Diffstat (limited to 'cc/installer.go')
| -rw-r--r-- | cc/installer.go | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/cc/installer.go b/cc/installer.go index 112a7ea6..7bedc564 100644 --- a/cc/installer.go +++ b/cc/installer.go @@ -48,6 +48,7 @@ type baseInstaller struct { dir string dir64 string + subDir string relative string location installLocation @@ -61,17 +62,17 @@ func (installer *baseInstaller) installerProps() []interface{} { } func (installer *baseInstaller) installDir(ctx ModuleContext) android.OutputPath { - subDir := installer.dir + dir := installer.dir if ctx.toolchain().Is64Bit() && installer.dir64 != "" { - subDir = installer.dir64 + dir = installer.dir64 } if !ctx.Host() && !ctx.Arch().Native { - subDir = filepath.Join(subDir, ctx.Arch().ArchType.String()) + dir = filepath.Join(dir, ctx.Arch().ArchType.String()) } if installer.location == InstallInData && ctx.vndk() { - subDir = filepath.Join(subDir, "vendor") + dir = filepath.Join(dir, "vendor") } - return android.PathForModuleInstall(ctx, subDir, installer.Properties.Relative_install_path, installer.relative) + return android.PathForModuleInstall(ctx, dir, installer.subDir, installer.Properties.Relative_install_path, installer.relative) } func (installer *baseInstaller) install(ctx ModuleContext, file android.Path) { |