commit 8f55b16fb6a506db36cd602343888ce1807e6e72
author Ben Cheng <bccheng@google.com> Fri Oct 18 12:11:34 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 18 12:11:34 2013 -0700
tree 578f0a810b621cc7f3caa3616e2bcaf1ac8a226f
parent 7732eb5bbad2c8f0c2ea850bcc97cf19d4a6bc58
parent ad6996a611c0af563edcb352828d3bd55cf85585

am ad6996a6: am 34cf868b: Merge "Point to the uapi header location for aarch64."

* commit 'ad6996a611c0af563edcb352828d3bd55cf85585':
  Point to the uapi header location for aarch64.

core/combo/TARGET_linux-aarch64.mk

diff --git a/core/combo/TARGET_linux-aarch64.mk b/core/combo/TARGET_linux-aarch64.mk
index 20be4c2..56dd157 100644
--- a/core/combo/TARGET_linux-aarch64.mk
+++ b/core/combo/TARGET_linux-aarch64.mk
@@ -134,8 +134,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/arch-$(TARGET_ARCH)
 endif
 KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH)