diff options
author | Dan Willemsen <dwillemsen@google.com> | 2016-05-31 16:27:00 -0700 |
---|---|---|
committer | Dan Willemsen <dwillemsen@google.com> | 2016-05-31 16:27:00 -0700 |
commit | 17f052647f5e4afcb3f5c4142d9a2ccec627faab (patch) | |
tree | b93e8e836e52fe7ca8c98d21fee7482f36a7da1d /android | |
parent | 5efc70689589019e04c1a5fe8975dc2671c9ac7b (diff) | |
download | build_soong-17f052647f5e4afcb3f5c4142d9a2ccec627faab.tar.gz build_soong-17f052647f5e4afcb3f5c4142d9a2ccec627faab.tar.bz2 build_soong-17f052647f5e4afcb3f5c4142d9a2ccec627faab.zip |
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
Diffstat (limited to 'android')
-rw-r--r-- | android/arch.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/android/arch.go b/android/arch.go index 952b7207..48cc0ab7 100644 --- a/android/arch.go +++ b/android/arch.go @@ -303,6 +303,7 @@ type Arch struct { CpuVariant string Abi []string ArchFeatures []string + Native bool } func (a Arch) String() string { @@ -911,6 +912,9 @@ func decodeArchProductVariables(variables productVariables) (map[HostType][]Arch if err != nil { return nil, nil, err } + if deviceArch.ArchType.Multilib == deviceSecondaryArch.ArchType.Multilib { + deviceSecondaryArch.Native = false + } deviceArches = append(deviceArches, deviceSecondaryArch) } @@ -973,6 +977,7 @@ func decodeMegaDevice() ([]Arch, error) { if err != nil { return nil, err } + arch.Native = false ret = append(ret, arch) } @@ -1005,6 +1010,7 @@ func decodeArch(arch string, archVariant, cpuVariant *string, abi *[]string) (Ar ArchVariant: stringPtr(archVariant), CpuVariant: stringPtr(cpuVariant), Abi: slicePtr(abi), + Native: true, } if a.ArchVariant == a.ArchType.Name || a.ArchVariant == "generic" { |