commit 2a1020b73bc37e87ca6dc0619dd1ea7788d8a242
author Christopher Ferris <cferris@google.com> Thu Feb 23 15:55:59 2017 -0800
committer Christopher Ferris <cferris@google.com> Fri Feb 24 09:35:50 2017 -0800
tree 17cd35286e2dd6919ab03386e514fddb1d813a39
parent ec2917363c948b0a7b0a5a831c4b6902ce897c8f

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: Ic16796a599dc577b4fef7f8e2a586162160955fb
Test: Builds without warningers/errors.

libfdt/Android.mk

diff --git a/libfdt/Android.mk b/libfdt/Android.mk
index a62d9ff..bca674e 100644
--- a/libfdt/Android.mk
+++ b/libfdt/Android.mk
@@ -15,6 +15,7 @@
 
 include $(CLEAR_VARS)
 
+LOCAL_CFLAGS := -Wno-macro-redefined
 LOCAL_SRC_FILES := $(common_src_files)
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
 LOCAL_MODULE := libfdt
@@ -26,6 +27,7 @@
 
 include $(CLEAR_VARS)
 
+LOCAL_CFLAGS := -Wno-macro-redefined
 LOCAL_SRC_FILES := $(common_src_files)
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
 LOCAL_MODULE := libfdt