diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-03-16 19:48:32 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2017-03-16 19:48:32 -0700 |
| commit | 615609854fc1531cedd8a52874d0fad57851b850 (patch) | |
| tree | 17bc565f536cccd3c3e6b834146fcb93e7a3e5e1 /cc/installer.go | |
| parent | 33edec5651391246f1a83bb660147d8290b14a1f (diff) | |
| download | android_build_soong-615609854fc1531cedd8a52874d0fad57851b850.tar.gz android_build_soong-615609854fc1531cedd8a52874d0fad57851b850.tar.bz2 android_build_soong-615609854fc1531cedd8a52874d0fad57851b850.zip | |
Revert "install *.so in different paths for their types"
This reverts commit 4c48f724e1b339128447ab1dafd656a9557557f5. It's
causing test failures, warnings and complaints, so backing it out and
we'll resolve those before putting it back in.
Bug: 33681361
Test: m -j
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 de04ab64..64f87d96 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) { |