StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update linux_bionic configuration

Browse Source 
Add a missing toolchain method, don't require modules to opt in to
linux_bionic.

Bug: 31559095
Test: attempt to build host bionic
Change-Id: Ia5c8e2f127b88f56191b7abc389d5329cfdb0720
This commit is contained in:
Dan Willemsen
2018-10-10 17:58:19 -07:00
parent 0db18c239a
commit 9ff34c0ca8
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/arch.go
View File

@@ -194,7 +194,7 @@ var (
NoOsType OsType NoOsType OsType
Linux = NewOsType("linux_glibc", Host, false) Linux = NewOsType("linux_glibc", Host, false)
Darwin = NewOsType("darwin", Host, false) Darwin = NewOsType("darwin", Host, false)
LinuxBionic = NewOsType("linux_bionic", Host, true) LinuxBionic = NewOsType("linux_bionic", Host, false)
Windows = NewOsType("windows", HostCross, true) Windows = NewOsType("windows", HostCross, true)
Android = NewOsType("android", Device, false) Android = NewOsType("android", Device, false)

4
cc/config/x86_linux_bionic_host.go
View File

@@ -139,6 +139,10 @@ func (t *toolchainLinuxBionic) Bionic() bool {
return true return true
} }
func (toolchainLinuxBionic) LibclangRuntimeLibraryArch() string {
return "x86_64"
}
var toolchainLinuxBionicSingleton Toolchain = &toolchainLinuxBionic{} var toolchainLinuxBionicSingleton Toolchain = &toolchainLinuxBionic{}
func linuxBionicToolchainFactory(arch android.Arch) Toolchain { func linuxBionicToolchainFactory(arch android.Arch) Toolchain {