summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2016-03-24 23:37:11 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-03-24 23:37:11 +0000
commit97acf025f4312f2ba183e25bc9b7d73b016a02a2 (patch)
tree955f96d310e4f33e67a930d15e39d7aaf6da3d61
parenta552c7c12623f8ada9d29bd64a4a55f1dfe03009 (diff)
parente222a57ba3eac071b9c3dd9d1a4c4afc2afe9624 (diff)
downloadandroid_frameworks_wilhelm-97acf025f4312f2ba183e25bc9b7d73b016a02a2.tar.gz
android_frameworks_wilhelm-97acf025f4312f2ba183e25bc9b7d73b016a02a2.tar.bz2
android_frameworks_wilhelm-97acf025f4312f2ba183e25bc9b7d73b016a02a2.zip
Merge "Make build warnings be errors" into nyc-dev
-rw-r--r--tests/Android.mk1
-rw-r--r--tests/automated/Android.mk1
-rw-r--r--tests/examples/Android.mk24
-rw-r--r--tests/listening/Android.mk4
-rw-r--r--tests/mimeUri/Android.mk8
-rw-r--r--tests/native-media/jni/Android.mk1
-rw-r--r--tests/sandbox/Android.mk15
-rw-r--r--tests/sandbox/streamSource/Android.mk1
8 files changed, 55 insertions, 0 deletions
diff --git a/tests/Android.mk b/tests/Android.mk
index 919a8fe..2072cf4 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -10,6 +10,7 @@ LOCAL_C_INCLUDES := $(call include-path-for, wilhelm)
LOCAL_SRC_FILES := mimeUri_test.cpp
LOCAL_MODULE := libopenslestests
LOCAL_MODULE_TAGS := tests
+LOCAL_CFLAGS := -Werror -Wall
include $(BUILD_NATIVE_TEST)
# Build the manual test programs.
diff --git a/tests/automated/Android.mk b/tests/automated/Android.mk
index ca41559..e530021 100644
--- a/tests/automated/Android.mk
+++ b/tests/automated/Android.mk
@@ -18,6 +18,7 @@ LOCAL_SHARED_LIBRARIES := \
LOCAL_STATIC_LIBRARIES := \
libOpenSLESUT \
+LOCAL_CFLAGS := -Werror -Wall
ifeq ($(TARGET_OS),linux)
LOCAL_CFLAGS += -DXP_UNIX
endif
diff --git a/tests/examples/Android.mk b/tests/examples/Android.mk
index 1d2b1ec..5fa486c 100644
--- a/tests/examples/Android.mk
+++ b/tests/examples/Android.mk
@@ -24,6 +24,8 @@ ifeq ($(TARGET_OS),linux)
LOCAL_CFLAGS += -DXP_UNIX
endif
+LOCAL_CFLAGS := -Werror -Wall
+
LOCAL_MODULE:= slesTest_recBuffQueue
include $(BUILD_EXECUTABLE)
@@ -49,6 +51,8 @@ endif
LOCAL_MODULE:= slesTest_playFdPath
+LOCAL_CFLAGS := -Werror -Wall
+
include $(BUILD_EXECUTABLE)
# slesTest_feedback
@@ -76,6 +80,7 @@ ifeq ($(TARGET_OS),linux)
#LOCAL_SHARED_LIBRARIES += librt
endif
+LOCAL_CFLAGS := -Werror -Wall
LOCAL_CFLAGS += -UNDEBUG
LOCAL_MODULE:= slesTest_feedback
@@ -104,6 +109,8 @@ endif
LOCAL_MODULE:= slesTest_sawtoothBufferQueue
+LOCAL_CFLAGS := -Werror -Wall
+
include $(BUILD_EXECUTABLE)
# slesTest_eqFdPath
@@ -127,6 +134,8 @@ endif
LOCAL_MODULE:= slesTest_eqFdPath
+LOCAL_CFLAGS := -Werror -Wall
+
include $(BUILD_EXECUTABLE)
# slesTest_eqOutputPath
@@ -150,6 +159,8 @@ endif
LOCAL_MODULE:= slesTest_eqOutputPath
+LOCAL_CFLAGS := -Werror -Wall
+
include $(BUILD_EXECUTABLE)
# slesTest_bassboostPath
@@ -173,6 +184,8 @@ endif
LOCAL_MODULE:= slesTest_bassboostPath
+LOCAL_CFLAGS := -Werror -Wall
+
include $(BUILD_EXECUTABLE)
# slesTest_virtualizer
@@ -196,6 +209,8 @@ endif
LOCAL_MODULE:= slesTest_virtualizer
+LOCAL_CFLAGS := -Werror -Wall
+
include $(BUILD_EXECUTABLE)
# slesTest_effectCapabilities
@@ -219,6 +234,8 @@ endif
LOCAL_MODULE:= slesTest_effectCapabilities
+LOCAL_CFLAGS := -Werror -Wall
+
include $(BUILD_EXECUTABLE)
# slesTest_sendToPresetReverb
@@ -242,6 +259,8 @@ endif
LOCAL_MODULE:= slesTest_sendToPresetReverb
+LOCAL_CFLAGS := -Werror -Wall
+
include $(BUILD_EXECUTABLE)
# slesTest_decodeToBuffQueue
@@ -265,6 +284,8 @@ endif
LOCAL_MODULE:= slesTest_decodeToBuffQueue
+LOCAL_CFLAGS := -Werror -Wall
+
include $(BUILD_EXECUTABLE)
###################
@@ -289,6 +310,7 @@ ifeq ($(TARGET_OS),linux)
LOCAL_CFLAGS += -DXP_UNIX
endif
+LOCAL_CFLAGS := -Werror -Wall
LOCAL_CFLAGS += -UNDEBUG
LOCAL_MODULE:= slesTest_decodeAac
@@ -319,4 +341,6 @@ endif
LOCAL_MODULE:= xaVideoDecoderCapabilities
+LOCAL_CFLAGS := -Werror -Wall
+
include $(BUILD_EXECUTABLE)
diff --git a/tests/listening/Android.mk b/tests/listening/Android.mk
index 2dd35c3..8eb4783 100644
--- a/tests/listening/Android.mk
+++ b/tests/listening/Android.mk
@@ -21,6 +21,8 @@ endif
LOCAL_MODULE:= slesTest_seekTorture
+LOCAL_CFLAGS := -Werror -Wall
+
include $(BUILD_EXECUTABLE)
#
@@ -44,4 +46,6 @@ endif
LOCAL_MODULE:= slesTest_playMuteSolo
+LOCAL_CFLAGS := -Werror -Wall
+
include $(BUILD_EXECUTABLE)
diff --git a/tests/mimeUri/Android.mk b/tests/mimeUri/Android.mk
index edf0580..c5dd3f4 100644
--- a/tests/mimeUri/Android.mk
+++ b/tests/mimeUri/Android.mk
@@ -17,6 +17,7 @@ LOCAL_SHARED_LIBRARIES := \
LOCAL_CFLAGS += -UNDEBUG
+LOCAL_CFLAGS := -Werror -Wall
ifeq ($(TARGET_OS),linux)
LOCAL_CFLAGS += -DXP_UNIX
endif
@@ -40,6 +41,7 @@ LOCAL_SRC_FILES:= \
LOCAL_SHARED_LIBRARIES := \
libOpenSLES
+LOCAL_CFLAGS := -Werror -Wall
LOCAL_CFLAGS += -UNDEBUG
ifeq ($(TARGET_OS),linux)
@@ -65,6 +67,7 @@ LOCAL_SRC_FILES:= \
LOCAL_SHARED_LIBRARIES := \
libOpenSLES
+LOCAL_CFLAGS := -Werror -Wall
LOCAL_CFLAGS += -UNDEBUG
ifeq ($(TARGET_OS),linux)
@@ -90,6 +93,7 @@ LOCAL_SRC_FILES:= \
LOCAL_SHARED_LIBRARIES := \
libOpenSLES
+LOCAL_CFLAGS := -Werror -Wall
LOCAL_CFLAGS += -UNDEBUG
ifeq ($(TARGET_OS),linux)
@@ -115,6 +119,7 @@ LOCAL_SRC_FILES:= \
LOCAL_SHARED_LIBRARIES := \
libOpenSLES
+LOCAL_CFLAGS := -Werror -Wall
LOCAL_CFLAGS += -UNDEBUG
ifeq ($(TARGET_OS),linux)
@@ -140,6 +145,7 @@ LOCAL_SRC_FILES:= \
LOCAL_SHARED_LIBRARIES := \
libOpenSLES
+LOCAL_CFLAGS := -Werror -Wall
LOCAL_CFLAGS += -UNDEBUG
ifeq ($(TARGET_OS),linux)
@@ -165,6 +171,7 @@ LOCAL_SRC_FILES:= \
LOCAL_SHARED_LIBRARIES := \
libOpenSLES
+LOCAL_CFLAGS := -Werror -Wall
LOCAL_CFLAGS += -UNDEBUG
ifeq ($(TARGET_OS),linux)
@@ -190,6 +197,7 @@ LOCAL_SRC_FILES:= \
LOCAL_SHARED_LIBRARIES := \
libOpenSLES
+LOCAL_CFLAGS := -Werror -Wall
LOCAL_CFLAGS += -UNDEBUG
ifeq ($(TARGET_OS),linux)
diff --git a/tests/native-media/jni/Android.mk b/tests/native-media/jni/Android.mk
index 8e3fb2b..e0b7edb 100644
--- a/tests/native-media/jni/Android.mk
+++ b/tests/native-media/jni/Android.mk
@@ -5,6 +5,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := tests
LOCAL_MODULE := libnative-media-jni
LOCAL_SRC_FILES := native-media-jni.c
+LOCAL_CFLAGS := -Werror -Wall
LOCAL_CFLAGS += -I$(call include-path-for, wilhelm)
LOCAL_CFLAGS += -UNDEBUG -Wno-unused-parameter
diff --git a/tests/sandbox/Android.mk b/tests/sandbox/Android.mk
index db8dcfe..4297e91 100644
--- a/tests/sandbox/Android.mk
+++ b/tests/sandbox/Android.mk
@@ -17,6 +17,7 @@ LOCAL_SHARED_LIBRARIES := \
liblog \
libOpenSLES
+LOCAL_CFLAGS := -Werror -Wall
ifeq ($(TARGET_OS),linux)
LOCAL_CFLAGS += -DXP_UNIX
#LOCAL_SHARED_LIBRARIES += librt
@@ -48,6 +49,7 @@ ifeq ($(TARGET_OS),linux)
LOCAL_CFLAGS += -DXP_UNIX
endif
+LOCAL_CFLAGS := -Werror -Wall
LOCAL_CFLAGS += -UNDEBUG
LOCAL_MODULE:= slesTest_multiplay
@@ -79,6 +81,7 @@ ifeq ($(TARGET_OS),linux)
LOCAL_CFLAGS += -DXP_UNIX
endif
+LOCAL_CFLAGS := -Werror -Wall
LOCAL_CFLAGS += -UNDEBUG
LOCAL_MODULE:= slesTest_engine
@@ -110,6 +113,7 @@ ifeq ($(TARGET_OS),linux)
LOCAL_CFLAGS += -DXP_UNIX
endif
+LOCAL_CFLAGS := -Werror -Wall
LOCAL_CFLAGS += -UNDEBUG
LOCAL_MODULE:= slesTest_object
@@ -136,6 +140,7 @@ ifeq ($(TARGET_OS),linux)
LOCAL_CFLAGS += -DXP_UNIX
endif
+LOCAL_CFLAGS := -Werror -Wall
LOCAL_CFLAGS += -UNDEBUG
LOCAL_MODULE:= slesTest_configbq
@@ -166,6 +171,7 @@ ifeq ($(TARGET_OS),linux)
LOCAL_CFLAGS += -DXP_UNIX
endif
+LOCAL_CFLAGS := -Werror -Wall
LOCAL_CFLAGS += -UNDEBUG
LOCAL_MODULE:= slesTest_reverb
@@ -196,6 +202,7 @@ ifeq ($(TARGET_OS),linux)
LOCAL_CFLAGS += -DXP_UNIX
endif
+LOCAL_CFLAGS := -Werror -Wall
LOCAL_CFLAGS += -UNDEBUG
LOCAL_MODULE:= slesTest_srcsink
@@ -227,6 +234,7 @@ ifeq ($(TARGET_OS),linux)
LOCAL_CFLAGS += -DXP_UNIX
endif
+LOCAL_CFLAGS := -Werror -Wall
LOCAL_CFLAGS += -UNDEBUG
LOCAL_MODULE:= slesTest_outputmix
@@ -257,6 +265,7 @@ ifeq ($(TARGET_OS),linux)
LOCAL_CFLAGS += -DXP_UNIX
endif
+LOCAL_CFLAGS := -Werror -Wall
LOCAL_CFLAGS += -UNDEBUG
LOCAL_MODULE:= slesTest_urimime
@@ -287,6 +296,7 @@ ifeq ($(TARGET_OS),linux)
LOCAL_CFLAGS += -DXP_UNIX
endif
+LOCAL_CFLAGS := -Werror -Wall
LOCAL_CFLAGS += -UNDEBUG
LOCAL_MODULE:= slesTest_dim
@@ -317,6 +327,7 @@ ifeq ($(TARGET_OS),linux)
LOCAL_CFLAGS += -DXP_UNIX
endif
+LOCAL_CFLAGS := -Werror -Wall
LOCAL_CFLAGS += -UNDEBUG
LOCAL_MODULE:= slesTest_multithread
@@ -351,6 +362,7 @@ ifeq ($(TARGET_OS),linux)
LOCAL_CFLAGS += -DXP_UNIX
endif
+LOCAL_CFLAGS := -Werror -Wall
LOCAL_CFLAGS += -UNDEBUG
LOCAL_MODULE:= slesTest_playbq
@@ -381,6 +393,7 @@ ifeq ($(TARGET_OS),linux)
LOCAL_CFLAGS += -DXP_UNIX
endif
+LOCAL_CFLAGS := -Werror -Wall
LOCAL_CFLAGS += -UNDEBUG
LOCAL_MODULE:= slesTest_monkey
@@ -411,6 +424,7 @@ ifeq ($(TARGET_OS),linux)
LOCAL_CFLAGS += -DXP_UNIX
endif
+LOCAL_CFLAGS := -Werror -Wall
LOCAL_CFLAGS += -UNDEBUG
LOCAL_MODULE:= slesTest_xa
@@ -442,6 +456,7 @@ ifeq ($(TARGET_OS),linux)
LOCAL_CFLAGS += -DXP_UNIX
endif
+LOCAL_CFLAGS := -Werror -Wall
LOCAL_CFLAGS += -UNDEBUG
LOCAL_MODULE:= slesTest_dual
diff --git a/tests/sandbox/streamSource/Android.mk b/tests/sandbox/streamSource/Android.mk
index 6abccbb..784e51f 100644
--- a/tests/sandbox/streamSource/Android.mk
+++ b/tests/sandbox/streamSource/Android.mk
@@ -15,6 +15,7 @@ LOCAL_SRC_FILES:= \
LOCAL_SHARED_LIBRARIES := \
libOpenSLES
+LOCAL_CFLAGS := -Werror -Wall
ifeq ($(TARGET_OS),linux)
LOCAL_CFLAGS += -DXP_UNIX
endif