summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Desaulniers <ndesaulniers@google.com>2016-11-16 11:24:15 -0800
committerNick Desaulniers <ndesaulniers@google.com>2016-11-16 11:24:27 -0800
commit05e334e75c0ff6e73bfdf99dad3f1482775c4c21 (patch)
tree1efc063e7521bcc109e4480ba38dad2373781513
parent38c3844f5acc4172a76305fbde3e8d1b1532f7cb (diff)
downloadutils-05e334e75c0ff6e73bfdf99dad3f1482775c4c21.tar.gz
reenable -Werror
Bug: 32873583 Change-Id: I15a8a23b8fb12a48e24981d4fffd7ac607fae3d5
-rw-r--r--media_resource_manager/arbitrator/Android.mk3
-rw-r--r--media_resource_manager/omx_adaptor/Android.mk2
-rw-r--r--media_resource_manager/test/Android.mk2
3 files changed, 4 insertions, 3 deletions
diff --git a/media_resource_manager/arbitrator/Android.mk b/media_resource_manager/arbitrator/Android.mk
index 9de52a5..0f86666 100644
--- a/media_resource_manager/arbitrator/Android.mk
+++ b/media_resource_manager/arbitrator/Android.mk
@@ -11,7 +11,6 @@ LOCAL_SHARED_LIBRARIES := \
libexpat \
libdl \
-
LOCAL_C_INCLUDES := \
$(TARGET_OUT_HEADERS)/khronos/openmax \
$(call include-path-for, frameworks-native)/media/openmax
@@ -20,6 +19,6 @@ LOCAL_C_INCLUDES := \
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libmrm_arbitrator
-#LOCAL_CFLAGS += -Werror
+LOCAL_CFLAGS += -Werror
include $(BUILD_SHARED_LIBRARY)
diff --git a/media_resource_manager/omx_adaptor/Android.mk b/media_resource_manager/omx_adaptor/Android.mk
index 1804ce1..a2914bc 100644
--- a/media_resource_manager/omx_adaptor/Android.mk
+++ b/media_resource_manager/omx_adaptor/Android.mk
@@ -22,6 +22,6 @@ LOCAL_C_INCLUDES := \
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libmrm_omx_adaptor
-#LOCAL_CFLAGS += -Werror
+LOCAL_CFLAGS += -Werror
include $(BUILD_SHARED_LIBRARY)
diff --git a/media_resource_manager/test/Android.mk b/media_resource_manager/test/Android.mk
index 7703265..70984f2 100644
--- a/media_resource_manager/test/Android.mk
+++ b/media_resource_manager/test/Android.mk
@@ -19,5 +19,7 @@ LOCAL_C_INCLUDES := \
#LOCAL_32_BIT_ONLY := true
+LOCAL_CFLAGS += -Werror
+
include $(BUILD_NATIVE_TEST)