Support installing non-native arch binaries
For the x86_arm target, which uses two 32-bit architectures, x86
libraries should be installed into ".../lib", and arm libraries should
be installed into ".../lib/arm".
This shouldn't be necessary for binaries, but non-native binaries aren't
supported in Make right now, so we can revisit this once it's necessary.
Change-Id: I4d883c85d3ef4945ff6149d9c4fc81af5023e12b
diff --git a/cc/cc.go b/cc/cc.go
index 9cdd66c..bac3e88 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -1347,6 +1347,9 @@
if ctx.toolchain().Is64Bit() && installer.dir64 != "" {
subDir = installer.dir64
}
+ if !ctx.Host() && !ctx.Arch().Native {
+ subDir = filepath.Join(subDir, ctx.Arch().ArchType.String())
+ }
dir := android.PathForModuleInstall(ctx, subDir, installer.Properties.Relative_install_path)
installer.path = ctx.InstallFile(dir, file)
}