commit f2044b41cf11e584ab5df87b6a11f04ae26c6865
author Ying Wang <wangying@android.com> Fri Jan 24 21:41:25 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 24 21:41:25 2014 +0000
tree ac7a8278d774f9be515dab7062f8a67e627c96de
parent e778ec89fd249e15608b7629963619d99e8a34bf
parent c3256c770df02135496503612a4ffdfa526af7e7

Merge "build: use arm kernel headers for arm 2nd arch builds"

core/combo/TARGET_linux-arm.mk

diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk
index bd9349c..ac2e3aa 100644
--- a/core/combo/TARGET_linux-arm.mk
+++ b/core/combo/TARGET_linux-arm.mk
@@ -197,7 +197,7 @@
 
 
 KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi
-KERNEL_HEADERS_ARCH   := $(libc_root)/kernel/uapi/asm-$(TARGET_ARCH)
+KERNEL_HEADERS_ARCH   := $(libc_root)/kernel/uapi/asm-$(TARGET_$(combo_2nd_arch_prefix)ARCH)
 KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH)
 
 $(combo_2nd_arch_prefix)TARGET_C_INCLUDES := \