Silence clang's whining for PCH files.

Clang whines about a "c-header" (.h rather than .hpp) being used in C++ mode (note that we use compile-cpp-source to build the header). Tell clang that we're building it as C++. Patch contributed by @DoDoENT. Bug: #16 Change-Id: I50803003394f28cf4f92faef13cd6ed680cbf77c
android · Mar 14, 2016 · da081ef · da081ef
1 parent f925c0e
commit da081ef
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 0 deletions.
diff --git a/build/core/build-binary.mk b/build/core/build-binary.mk
@@ -431,6 +431,10 @@ ifneq (,$(LOCAL_PCH))
     # Build PCH into obj directory
     LOCAL_BUILT_PCH := $(call get-pch-name,$(LOCAL_PCH))
 
+    # Clang whines about a "c-header" (.h rather than .hpp) being used in C++
+    # mode (note that we use compile-cpp-source to build the header).
+    LOCAL_SRC_FILES_TARGET_CFLAGS.$(LOCAL_PCH) += -x c++-header
+
     # Build PCH
     $(call compile-cpp-source,$(LOCAL_PCH),$(LOCAL_BUILT_PCH).gch)
 

diff --git a/tests/build/pch-cpp/jni/Android.mk b/tests/build/pch-cpp/jni/Android.mk
@@ -0,0 +1,15 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := pch-cpp
+LOCAL_PCH := stdafx.h
+LOCAL_SRC_FILES := foo.cpp
+LOCAL_CFLAGS := -Werror
+include $(BUILD_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := pch-c
+LOCAL_PCH := stdafx.h
+LOCAL_SRC_FILES := foo.c
+LOCAL_CFLAGS := -Werror
+include $(BUILD_SHARED_LIBRARY)
diff --git a/tests/build/pch-cpp/jni/foo.c b/tests/build/pch-cpp/jni/foo.c
diff --git a/tests/build/pch-cpp/jni/foo.cpp b/tests/build/pch-cpp/jni/foo.cpp
diff --git a/tests/build/pch-cpp/jni/stdafx.h b/tests/build/pch-cpp/jni/stdafx.h