commit a4a1061fbf5e59319510528a7eda77fe8f6fbd09
author Elliott Hughes <enh@google.com> Thu Nov 21 10:12:26 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Nov 21 10:12:26 2013 -0800
tree d61908c5e944085060362288982fa00b2d154605
parent f817876b9951160f2fdb02579c08b63156a9596f
parent bd36506ee4ece41b8a32ac5b078e4538af4bc02a

am bd36506e: am e57c8446: Merge "Switch x86 to uapi headers."

* commit 'bd36506ee4ece41b8a32ac5b078e4538af4bc02a':
  Switch x86 to uapi headers.

core/combo/TARGET_linux-x86.mk

diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk
index 795a016..b7a16d6 100755
--- a/core/combo/TARGET_linux-x86.mk
+++ b/core/combo/TARGET_linux-x86.mk
@@ -110,10 +110,11 @@
     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-$(TARGET_ARCH)
+    KERNEL_HEADERS_AUX    := $(libc_root)/kernel/common
 endif
-KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH)
+KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH) $(KERNEL_HEADERS_AUX)
 
 android_config_h := $(call select-android-config-h,target_linux-x86)