Restrict -fvisibility-inlines-hidden to C++ code
gcc objects to using -fvisibility-inlines-hidden with C code:
cc1: error: command line option "-fvisibility-inlines-hidden"
is valid for C++/ObjC++ but not for C
Move it from CFLAGS to CPPFLAGS.
Change-Id: I151530748b0d083d8edb50df94db23d101ad01c6
diff --git a/NativeCode.mk b/NativeCode.mk
index f17e14a..7c6dbfc 100644
--- a/NativeCode.mk
+++ b/NativeCode.mk
@@ -78,8 +78,9 @@
core_c_includes := $(sort libcore/include $(LOCAL_C_INCLUDES) $(JNI_H_INCLUDE))
core_shared_libraries := $(sort $(LOCAL_SHARED_LIBRARIES))
core_static_libraries := $(sort $(LOCAL_STATIC_LIBRARIES))
-core_cflags := -fvisibility=hidden -fvisibility-inlines-hidden
+core_cflags := -fvisibility=hidden
core_cflags += '-DGCC_HIDDEN=__attribute__((visibility("hidden")))'
+core_cppflags := -fvisibility-inlines-hidden
#
@@ -90,6 +91,7 @@
LOCAL_CFLAGS += -Wall -Wextra -Werror
LOCAL_CFLAGS += $(core_cflags)
+LOCAL_CPPFLAGS += $(core_cppflags)
ifeq ($(TARGET_ARCH),arm)
# Ignore "note: the mangling of 'va_list' has changed in GCC 4.4"
LOCAL_CFLAGS += -Wno-psabi
@@ -117,6 +119,7 @@
# Define the rules.
LOCAL_SRC_FILES := $(core_src_files)
LOCAL_CFLAGS += $(core_cflags)
+ LOCAL_CPPFLAGS += $(core_cppflags)
LOCAL_C_INCLUDES := $(core_c_includes)
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libjavacore-host