diff options
| author | 2017-03-17 22:45:29 +0000 | |
|---|---|---|
| committer | 2017-03-17 22:45:31 +0000 | |
| commit | 3250879667050a67f1e0ead62dba23f08a059be4 (patch) | |
| tree | 56fd3b42ee2d4182092d0b4926d38783a22735e4 /cc/installer.go | |
| parent | 6bdcc8ddd6c1803f33f0917bc19880fff2bfa98d (diff) | |
| parent | 615609854fc1531cedd8a52874d0fad57851b850 (diff) | |
Merge "Revert "install *.so in different paths for their types""
Diffstat (limited to 'cc/installer.go')
| -rw-r--r-- | cc/installer.go | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/cc/installer.go b/cc/installer.go index de04ab64d..64f87d965 100644 --- a/cc/installer.go +++ b/cc/installer.go @@ -47,7 +47,6 @@ type baseInstaller struct { dir string dir64 string - subDir string relative string location installLocation @@ -61,14 +60,14 @@ func (installer *baseInstaller) installerProps() []interface{} { } func (installer *baseInstaller) installDir(ctx ModuleContext) android.OutputPath { - dir := installer.dir + subDir := installer.dir if ctx.toolchain().Is64Bit() && installer.dir64 != "" { - dir = installer.dir64 + subDir = installer.dir64 } if !ctx.Host() && !ctx.Arch().Native { - dir = filepath.Join(dir, ctx.Arch().ArchType.String()) + subDir = filepath.Join(subDir, ctx.Arch().ArchType.String()) } - return android.PathForModuleInstall(ctx, dir, installer.subDir, installer.Properties.Relative_install_path, installer.relative) + return android.PathForModuleInstall(ctx, subDir, installer.Properties.Relative_install_path, installer.relative) } func (installer *baseInstaller) install(ctx ModuleContext, file android.Path) { |