commit 3d252fdd97fe3a2f5c5085057302304a132a2ed0
author Dan Albert <danalbert@google.com> Sat Aug 08 18:38:18 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Aug 08 18:38:18 2015 +0000
tree d235b401378ce09f033444e1aca6f99c5f31ef23
parent 8de1eb48bf81306f8ba90dea13a36bc2f4c2eeeb
parent d536dbd624196e825e8d4764da53c0d0773772eb

am d536dbd6: am 290059fb: Probably fix the mac build.

* commit 'd536dbd624196e825e8d4764da53c0d0773772eb':
  Probably fix the mac build.

checkpolicy/Android.mk

diff --git a/checkpolicy/Android.mk b/checkpolicy/Android.mk
index a91835a..09ca2ac 100644
--- a/checkpolicy/Android.mk
+++ b/checkpolicy/Android.mk
@@ -37,7 +37,8 @@
 LOCAL_MODULE := checkpolicy
 LOCAL_MODULE_TAGS := optional
 LOCAL_C_INCLUDES := $(common_includes) 
-LOCAL_CPPFLAGS := $(yacc_flags) $(common_cflags)
+LOCAL_CFLAGS := $(common_cflags)
+LOCAL_CPPFLAGS := $(yacc_flags)
 LOCAL_SRC_FILES := $(common_src_files) checkpolicy.c
 LOCAL_STATIC_LIBRARIES := libsepol
 LOCAL_YACCFLAGS := -v
@@ -54,7 +55,8 @@
 LOCAL_MODULE := checkmodule
 LOCAL_MODULE_TAGS := optional
 LOCAL_C_INCLUDES := $(common_includes) 
-LOCAL_CPPFLAGS := $(yacc_flags) $(common_cflags)
+LOCAL_CFLAGS := $(common_cflags)
+LOCAL_CPPFLAGS := $(yacc_flags)
 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 6df4b64..45eaafc 100644
--- a/libsepol/Android.mk
+++ b/libsepol/Android.mk
@@ -93,7 +93,8 @@
 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_CPPFLAGS := $(yacc_flags) $(common_cflags)
+LOCAL_CFLAGS := $(common_cflags)
+LOCAL_CPPFLAGS := $(yacc_flags)
 LOCAL_SRC_FILES := $(common_src_files) $(cil_src_files)
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 
@@ -107,7 +108,8 @@
 LOCAL_MODULE := libsepol
 LOCAL_MODULE_TAGS := optional
 LOCAL_C_INCLUDES := $(common_includes) 
-LOCAL_CPPFLAGS := $(yacc_flags) $(common_cflags)
+LOCAL_CFLAGS := $(common_cflags)
+LOCAL_CPPFLAGS := $(yacc_flags)
 LOCAL_SRC_FILES := $(common_src_files) $(cil_src_files)
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES