commit 2cd425cc19212acea595e7dd76d6d8ebd3776e95
author Christopher Ferris <cferris@google.com> Thu Feb 23 15:40:10 2017 -0800
committer Christopher Ferris <cferris@google.com> Fri Feb 24 09:36:36 2017 -0800
tree c65013e66ff9d724768a4a60e586dd47da985f0b
parent 379571405632a407b8ad0e4cea6a3ec86e5703c1

Disable macro redefined warnings.

The new kernel headers do:

  #define __bitwise __bitwise__

However, the code redefines __bitwise without undef'ing it first.

This is a temporary fix, b/35721782 filed to fix this.

Change-Id: Ifc169910091d5b5291ae50c75ebef7c569d140be
Test: Builds without warningers/errors.

Android.mk

diff --git a/Android.mk b/Android.mk
index 9903482..2de4be9 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,6 +1,7 @@
 LOCAL_PATH:= $(call my-dir)
 
 include $(CLEAR_VARS)
+LOCAL_CFLAGS := -Wno-macro-redefined
 LOCAL_C_INCLUDES:= $(LOCAL_PATH)/include
 LOCAL_SRC_FILES:= compress.c utils.c
 LOCAL_MODULE := libtinycompress
@@ -11,6 +12,7 @@
 
 include $(CLEAR_VARS)
 
+LOCAL_CFLAGS := -Wno-macro-redefined
 LOCAL_C_INCLUDES:= $(LOCAL_PATH)/include
 LOCAL_SRC_FILES:= cplay.c
 LOCAL_MODULE := cplay