commit 831f5ec72977a5088f700d5f3c4c41f819245068
author Elliott Hughes <enh@google.com> Fri Sep 19 08:11:37 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 19 08:11:37 2014 +0000
tree 4132b70947984dac9d2ece9d41e76b5c62aed8f0
parent 3fd3e2f8d32b89cc4c75bf51e1b81373fc555cc1
parent b94f002963883e7442c6c3862304123113c6dc54

am b94f0029: am 6d90028e: Correctly identify the aarch64 kernel\'s signal trampoline.

* commit 'b94f002963883e7442c6c3862304123113c6dc54':

Android.build.mk

diff --git a/Android.build.mk b/Android.build.mk
index 85d540a..05fe986 100644
--- a/Android.build.mk
+++ b/Android.build.mk
@@ -48,6 +48,12 @@
     $($(module)_cflags) \
     $($(module)_cflags_$(build_type)) \
 
+LOCAL_CLANG_CFLAGS += \
+    $(common_clang_cflags) \
+    $(common_clang_cflags_$(build_type)) \
+    $($(module)_clang_cflags) \
+    $($(module)_clang_cflags_$(build_type)) \
+
 LOCAL_CONLYFLAGS += \
     $(common_conlyflags) \
     $(common_conlyflags_$(build_type)) \

Android.mk

diff --git a/Android.mk b/Android.mk
index 155a9f1..c3b63a4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -37,10 +37,8 @@
 common_cflags_target := \
 	-Wno-maybe-uninitialized \
 
-ifeq ($(LOCAL_CLANG),true)
 # src/mi/backtrace.c is misdetected as a bogus header guard by clang 3.5
-common_cflags += -Wno-header-guard
-endif
+common_clang_cflags += -Wno-header-guard
 
 ifneq ($(debug),true)
 common_cflags += \