commit 600b97372271bd6c24d9884169cd491ba3792dc7
author Elliott Hughes <enh@google.com> Fri Nov 08 14:47:10 2013 -0800
committer Elliott Hughes <enh@google.com> Fri Nov 08 14:47:10 2013 -0800
tree 74e2157495a5410325336b5098c8ba1e148668f5
parent 7b954f4c77aa49633caac196dd9343775d05e81a

Switch x86_64 over to uapi headers.

Bug: 11559337
Change-Id: Ia0a8dff9194375172d1c89daae917d2d8952ace7

core/combo/TARGET_linux-x86_64.mk

diff --git a/core/combo/TARGET_linux-x86_64.mk b/core/combo/TARGET_linux-x86_64.mk
index 86d29f5..02cb57a 100755
--- a/core/combo/TARGET_linux-x86_64.mk
+++ b/core/combo/TARGET_linux-x86_64.mk
@@ -110,8 +110,8 @@
     KERNEL_HEADERS_COMMON := $(CUSTOM_KERNEL_HEADERS)
     KERNEL_HEADERS_ARCH   := $(CUSTOM_KERNEL_HEADERS)
 else
-    KERNEL_HEADERS_COMMON := $(libc_root)/kernel/common
-    KERNEL_HEADERS_ARCH   := $(libc_root)/kernel/arch-$(TARGET_ARCH)
+    KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi
+    KERNEL_HEADERS_ARCH   := $(libc_root)/kernel/uapi/asm-x86 # x86 covers both x86 and x86_64.
 endif
 KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH)