From 00fcbde4013a1289a5bd3f7e19ce81eb70b6c707 Mon Sep 17 00:00:00 2001
From: Dan Willemsen <dwillemsen@google.com>
Date: Thu, 17 Nov 2016 00:25:59 -0800
Subject: [PATCH] Add LinuxBionic OsType

Actual support will come in later changes.

Bug: 31559095
Test: out/soong/build.ninja is identical
Change-Id: I31392fb78a51f43567d16aef89e32cd5137cdbc1
---
 Android.bp      | 17 +++++++++++++++++
 android/arch.go | 20 +++++++++++---------
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/Android.bp b/Android.bp
index 93240200c..66702b1e8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -186,6 +186,23 @@ bootstrap_go_package {
     pluginFor: ["soong_build"],
 }
 
+//
+// 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 2ef6e248c..0cd491638 100644
--- a/android/arch.go
+++ b/android/arch.go
@@ -191,17 +191,19 @@ var BuildOs = func() OsType {
 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},
 	}
 )