am 236b3eb6: am e67104a6: Merge "Use CPPFLAGS instead of CFLAGS."

* commit '236b3eb6a085bd0762849b5feca880f6dc63787d':
  Use CPPFLAGS instead of CFLAGS.
This commit is contained in:
Dan Albert
2015-08-08 00:56:58 +00:00
committed by Android Git Automerger
+4 -4
View File
@@ -21,10 +21,10 @@ LOCAL_SRC_FILES := \
$(edify_src_files) \ $(edify_src_files) \
main.c main.c
LOCAL_CFLAGS := $(edify_cflags) -g -O0 LOCAL_CPPFLAGS := $(edify_cflags) -g -O0
LOCAL_MODULE := edify LOCAL_MODULE := edify
LOCAL_YACCFLAGS := -v LOCAL_YACCFLAGS := -v
LOCAL_CFLAGS += -Wno-unused-parameter LOCAL_CPPFLAGS += -Wno-unused-parameter
LOCAL_CLANG := true LOCAL_CLANG := true
include $(BUILD_HOST_EXECUTABLE) include $(BUILD_HOST_EXECUTABLE)
@@ -36,8 +36,8 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(edify_src_files) LOCAL_SRC_FILES := $(edify_src_files)
LOCAL_CFLAGS := $(edify_cflags) LOCAL_CPPFLAGS := $(edify_cflags)
LOCAL_CFLAGS += -Wno-unused-parameter LOCAL_CPPFLAGS += -Wno-unused-parameter
LOCAL_MODULE := libedify LOCAL_MODULE := libedify
LOCAL_CLANG := true LOCAL_CLANG := true