commit 8de1eb48bf81306f8ba90dea13a36bc2f4c2eeeb
author Dan Albert <danalbert@google.com> Sat Aug 08 00:56:59 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Aug 08 00:56:59 2015 +0000
tree 3330d3c020be6fdf8c7a6388a6fde9f6f0e94735
parent f1d0d8870f0175fe4b67ae59564e9c0d37cd6b22
parent 837c9084ab471b3519420158089b13457fadb719

am 837c9084: am 6d96f307: Use CPPFLAGS instead of CFLAGS.

* commit '837c9084ab471b3519420158089b13457fadb719':
  Use CPPFLAGS instead of CFLAGS.

checkpolicy/Android.mk

diff --git a/checkpolicy/Android.mk b/checkpolicy/Android.mk
index f3f3b8f..a91835a 100644
--- a/checkpolicy/Android.mk
+++ b/checkpolicy/Android.mk
@@ -37,7 +37,7 @@
 LOCAL_MODULE := checkpolicy
 LOCAL_MODULE_TAGS := optional
 LOCAL_C_INCLUDES := $(common_includes) 
-LOCAL_CFLAGS := $(yacc_flags) $(common_cflags)
+LOCAL_CPPFLAGS := $(yacc_flags) $(common_cflags)
 LOCAL_SRC_FILES := $(common_src_files) checkpolicy.c
 LOCAL_STATIC_LIBRARIES := libsepol
 LOCAL_YACCFLAGS := -v
@@ -54,7 +54,7 @@
 LOCAL_MODULE := checkmodule
 LOCAL_MODULE_TAGS := optional
 LOCAL_C_INCLUDES := $(common_includes) 
-LOCAL_CFLAGS := $(yacc_flags) $(common_cflags)
+LOCAL_CPPFLAGS := $(yacc_flags) $(common_cflags)
 LOCAL_SRC_FILES := $(common_src_files) checkmodule.c
 LOCAL_STATIC_LIBRARIES := libsepol
 LOCAL_YACCFLAGS := -v

libsepol/Android.mk

diff --git a/libsepol/Android.mk b/libsepol/Android.mk
index 730fac3..6df4b64 100644
--- a/libsepol/Android.mk
+++ b/libsepol/Android.mk
@@ -93,7 +93,7 @@
 LOCAL_COPY_HEADERS_TO := sepol
 LOCAL_COPY_HEADERS := include/sepol/handle.h include/sepol/policydb.h cil/include/cil/cil.h
 LOCAL_C_INCLUDES := $(common_includes) 
-LOCAL_CFLAGS := $(yacc_flags) $(common_cflags)
+LOCAL_CPPFLAGS := $(yacc_flags) $(common_cflags)
 LOCAL_SRC_FILES := $(common_src_files) $(cil_src_files)
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 
@@ -107,7 +107,7 @@
 LOCAL_MODULE := libsepol
 LOCAL_MODULE_TAGS := optional
 LOCAL_C_INCLUDES := $(common_includes) 
-LOCAL_CFLAGS := $(yacc_flags) $(common_cflags)
+LOCAL_CPPFLAGS := $(yacc_flags) $(common_cflags)
 LOCAL_SRC_FILES := $(common_src_files) $(cil_src_files)
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES