From b02e90f85cb60a6de0ff93147e988c10c4cf213a Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Fri, 7 Aug 2015 17:24:49 -0700 Subject: Use CPPFLAGS instead of CFLAGS. While we build these as C, to the build system they are technically C++ and are subject to the global CPPFLAGS. Set LOCAL_CPPFLAGS here instead of LOCAL_CFLAGS so we can be sure we override anything provided by the build system. Bug: http://b/23043421 Change-Id: I344b54ae4ff9f142365a42c33ba160c1be17a342 --- edify/Android.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/edify/Android.mk b/edify/Android.mk index c36645045..eb366c287 100644 --- a/edify/Android.mk +++ b/edify/Android.mk @@ -21,10 +21,10 @@ LOCAL_SRC_FILES := \ $(edify_src_files) \ main.c -LOCAL_CFLAGS := $(edify_cflags) -g -O0 +LOCAL_CPPFLAGS := $(edify_cflags) -g -O0 LOCAL_MODULE := edify LOCAL_YACCFLAGS := -v -LOCAL_CFLAGS += -Wno-unused-parameter +LOCAL_CPPFLAGS += -Wno-unused-parameter LOCAL_CLANG := true include $(BUILD_HOST_EXECUTABLE) @@ -36,8 +36,8 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(edify_src_files) -LOCAL_CFLAGS := $(edify_cflags) -LOCAL_CFLAGS += -Wno-unused-parameter +LOCAL_CPPFLAGS := $(edify_cflags) +LOCAL_CPPFLAGS += -Wno-unused-parameter LOCAL_MODULE := libedify LOCAL_CLANG := true -- cgit v1.2.3