From b68ea7a66cafc14f1c4d42d58929ee598ee0c2fc Mon Sep 17 00:00:00 2001
From: Christopher Ferris <cferris@google.com>
Date: Mon, 18 Jul 2016 18:36:31 -0700
Subject: [PATCH] Add android/uapi kernel header.

Add the new android/uapi kernel header include directory.

Bug: 30072483
Change-Id: I3e1394b9abd744c7f76b0ac73bb07f614745a248
---
 cc/arm64_device.go  | 1 +
 cc/arm_device.go    | 1 +
 cc/mips64_device.go | 1 +
 cc/mips_device.go   | 1 +
 cc/x86_64_device.go | 1 +
 cc/x86_device.go    | 1 +
 6 files changed, 6 insertions(+)

diff --git a/cc/arm64_device.go b/cc/arm64_device.go
index 8e7c57b0a..b951c1a61 100644
--- a/cc/arm64_device.go
+++ b/cc/arm64_device.go
@@ -103,6 +103,7 @@ func init() {
 		"-isystem ${LibcRoot}/arch-arm64/include",
 		"-isystem ${LibcRoot}/include",
 		"-isystem ${LibcRoot}/kernel/uapi",
+		"-isystem ${LibcRoot}/kernel/android/uapi",
 		"-isystem ${LibcRoot}/kernel/common",
 		"-isystem ${LibcRoot}/kernel/uapi/asm-arm64",
 	}, " "))
diff --git a/cc/arm_device.go b/cc/arm_device.go
index 1624cfcc9..e985a3825 100644
--- a/cc/arm_device.go
+++ b/cc/arm_device.go
@@ -172,6 +172,7 @@ func init() {
 		"-isystem ${LibcRoot}/arch-arm/include",
 		"-isystem ${LibcRoot}/include",
 		"-isystem ${LibcRoot}/kernel/uapi",
+		"-isystem ${LibcRoot}/kernel/android/uapi",
 		"-isystem ${LibcRoot}/kernel/common",
 		"-isystem ${LibcRoot}/kernel/uapi/asm-arm",
 	}, " "))
diff --git a/cc/mips64_device.go b/cc/mips64_device.go
index 474f284ae..19f9caf72 100644
--- a/cc/mips64_device.go
+++ b/cc/mips64_device.go
@@ -104,6 +104,7 @@ func init() {
 		"-isystem ${LibcRoot}/arch-mips64/include",
 		"-isystem ${LibcRoot}/include",
 		"-isystem ${LibcRoot}/kernel/uapi",
+		"-isystem ${LibcRoot}/kernel/android/uapi",
 		"-isystem ${LibcRoot}/kernel/common",
 		"-isystem ${LibcRoot}/kernel/uapi/asm-mips",
 	}, " "))
diff --git a/cc/mips_device.go b/cc/mips_device.go
index 7204e3610..ac6f2b1bd 100644
--- a/cc/mips_device.go
+++ b/cc/mips_device.go
@@ -141,6 +141,7 @@ func init() {
 		"-isystem ${LibcRoot}/arch-mips/include",
 		"-isystem ${LibcRoot}/include",
 		"-isystem ${LibcRoot}/kernel/uapi",
+		"-isystem ${LibcRoot}/kernel/android/uapi",
 		"-isystem ${LibcRoot}/kernel/common",
 		"-isystem ${LibcRoot}/kernel/uapi/asm-mips",
 	}, " "))
diff --git a/cc/x86_64_device.go b/cc/x86_64_device.go
index 986dc8665..a795ba7d9 100644
--- a/cc/x86_64_device.go
+++ b/cc/x86_64_device.go
@@ -152,6 +152,7 @@ func init() {
 		"-isystem ${LibcRoot}/arch-x86_64/include",
 		"-isystem ${LibcRoot}/include",
 		"-isystem ${LibcRoot}/kernel/uapi",
+		"-isystem ${LibcRoot}/kernel/android/uapi",
 		"-isystem ${LibcRoot}/kernel/common",
 		"-isystem ${LibcRoot}/kernel/uapi/asm-x86",
 	}, " "))
diff --git a/cc/x86_device.go b/cc/x86_device.go
index f16e68b34..72689fb33 100644
--- a/cc/x86_device.go
+++ b/cc/x86_device.go
@@ -171,6 +171,7 @@ func init() {
 		"-isystem ${LibcRoot}/arch-x86/include",
 		"-isystem ${LibcRoot}/include",
 		"-isystem ${LibcRoot}/kernel/uapi",
+		"-isystem ${LibcRoot}/kernel/android/uapi",
 		"-isystem ${LibcRoot}/kernel/common",
 		"-isystem ${LibcRoot}/kernel/uapi/asm-x86",
 	}, " "))