summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chih-hung Hsieh <chh@google.com> 2017-12-06 03:25:11 +0000
committer android-build-merger <android-build-merger@google.com> 2017-12-06 03:25:11 +0000
commit753faba697bce7a8c6a32d451777f0613d51cf21 (patch)
treef68ba5433dd3e4176ad7ac887169cad75d32b3c1
parent5d2bd6bf0cb9f20dfa92e56d4eeeea530b6565b2 (diff)
parent6fb084db88dde09929185e6becd07410d7beb0d0 (diff)
Merge "Use -Werror in frameworks/base/tests/backup" am: d5dca64f72
am: 6fb084db88 Change-Id: I6d18cc00937896bb227fc1ba30bc6102f84029b3
-rw-r--r--tests/backup/Android.mk4
-rw-r--r--tests/backup/backup_helper_test.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/backup/Android.mk b/tests/backup/Android.mk
index 88794c26520e..202a699c1706 100644
--- a/tests/backup/Android.mk
+++ b/tests/backup/Android.mk
@@ -20,7 +20,8 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
backup_helper_test.cpp
-
+
+LOCAL_CFLAGS := -Wall -Werror
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := backup_helper_test
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
@@ -43,4 +44,3 @@ LOCAL_PACKAGE_NAME := BackupTest
LOCAL_PROGUARD_ENABLED := disabled
include $(BUILD_PACKAGE)
-
diff --git a/tests/backup/backup_helper_test.cpp b/tests/backup/backup_helper_test.cpp
index b5f6ff57e6d9..457dcc40a607 100644
--- a/tests/backup/backup_helper_test.cpp
+++ b/tests/backup/backup_helper_test.cpp
@@ -118,7 +118,7 @@ main(int argc, const char** argv)
#else
int
-main(int argc, char** argv)
+main(int, char**)
{
printf ("test_backup_helper built without the tests\n");
return 0;