commit fc6e97611e98aa88d829ad0ee19c56168884c818
author Bill Yi <byi@google.com> Wed Oct 24 10:22:01 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Oct 24 10:22:01 2018 -0700
tree e0df58c6609831d33e23f47e8c1678fc2c324b36
parent d57d9976cd0eec76592f25a83aba2319a898ea74
parent 6c3324a3b48c7b535ddfd5f864abfbfe18d58b1f

[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: 89c726ecaf  -s ours
am: 6c3324a3b4  -s ours

Change-Id: I64d3307c76273b6117141196c24fff8310825056

ipacm/src/Android.mk

diff --git a/ipacm/src/Android.mk b/ipacm/src/Android.mk
index 596e040..269df4a 100644
--- a/ipacm/src/Android.mk
+++ b/ipacm/src/Android.mk
@@ -19,7 +19,7 @@
 
 LOCAL_CFLAGS := -v
 LOCAL_CFLAGS += -DFEATURE_IPA_ANDROID
-LOCAL_CFLAGS += -DFEATURE_IPACM_HAL -Wall -Werror -Wno-error=macro-redefined
+LOCAL_CFLAGS += -DFEATURE_IPACM_HAL -Wall -Werror -Wno-error=macro-redefined -Wno-enum-compare
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 LOCAL_CFLAGS += -DDEBUG
 endif