commit c5b90cd09a33141a55aa7ed27d3efa81a74e04aa
author Christopher Ferris <cferris@google.com> Mon Feb 27 20:27:52 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Feb 27 20:27:52 2017 +0000
tree c65013e66ff9d724768a4a60e586dd47da985f0b
parent 379571405632a407b8ad0e4cea6a3ec86e5703c1
parent f142652670ef35451f5a303917898199e70fc047

Merge "Disable macro redefined warnings." am: 3fd572943a am: 68460e6550
am: f142652670

Change-Id: If4737edc7d976a28f0cdb286e7c2af169ecb7691

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