Add LinuxBionic OsType
Actual support will come in later changes.
Bug: 31559095
Test: out/soong/build.ninja is identical
Change-Id: I31392fb78a51f43567d16aef89e32cd5137cdbc1
diff --git a/Android.bp b/Android.bp
index 9324020..66702b1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -187,6 +187,23 @@
}
//
+// Defaults to enable various configurations of host bionic
+//
+
+cc_defaults {
+ name: "linux_bionic_supported",
+ host_supported: true,
+ target: {
+ host: {
+ enabled: false,
+ },
+ linux_bionic: {
+ enabled: true,
+ },
+ },
+}
+
+//
// C static libraries extracted from the gcc toolchain
//
diff --git a/android/arch.go b/android/arch.go
index 2ef6e24..0cd4916 100644
--- a/android/arch.go
+++ b/android/arch.go
@@ -191,17 +191,19 @@
var (
osTypeList []OsType
- NoOsType OsType
- Linux = NewOsType("linux", Host, false)
- Darwin = NewOsType("darwin", Host, false)
- Windows = NewOsType("windows", HostCross, true)
- Android = NewOsType("android", Device, false)
+ NoOsType OsType
+ Linux = NewOsType("linux", Host, false)
+ Darwin = NewOsType("darwin", Host, false)
+ LinuxBionic = NewOsType("linux_bionic", Host, true)
+ Windows = NewOsType("windows", HostCross, true)
+ Android = NewOsType("android", Device, false)
osArchTypeMap = map[OsType][]ArchType{
- Linux: []ArchType{X86, X86_64},
- Darwin: []ArchType{X86, X86_64},
- Windows: []ArchType{X86, X86_64},
- Android: []ArchType{Arm, Arm64, Mips, Mips64, X86, X86_64},
+ Linux: []ArchType{X86, X86_64},
+ LinuxBionic: []ArchType{X86_64},
+ Darwin: []ArchType{X86, X86_64},
+ Windows: []ArchType{X86, X86_64},
+ Android: []ArchType{Arm, Arm64, Mips, Mips64, X86, X86_64},
}
)