Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd4518d9 authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by android-build-merger
Browse files

Merge "Use -Werror in frameworks/base/tests/backup" am: d5dca64f am: 6fb084db 

am: 753faba6

Change-Id: I917ea7c1627f09ed7274dc04481e36cee5c88060
parents 53994038 753faba6

tests/backup/Android.mk

+2 −2
Original line number Original line Diff line number Diff line
@@ -21,6 +21,7 @@ include $(CLEAR_VARS) 
LOCAL_SRC_FILES := \

LOCAL_SRC_FILES := \

    backup_helper_test.cpp

    backup_helper_test.cpp





LOCAL_CFLAGS := -Wall -Werror

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE := backup_helper_test

LOCAL_MODULE := backup_helper_test

LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)

LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
@@ -43,4 +44,3 @@ LOCAL_PACKAGE_NAME := BackupTest 
LOCAL_PROGUARD_ENABLED := disabled

LOCAL_PROGUARD_ENABLED := disabled





include $(BUILD_PACKAGE)
 
include $(BUILD_PACKAGE)

tests/backup/backup_helper_test.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -118,7 +118,7 @@ main(int argc, const char** argv) 




#else

#else

int

int

main(int argc, char** argv)

main(int, char**)

{

{

    printf ("test_backup_helper built without the tests\n");

    printf ("test_backup_helper built without the tests\n");

    return 0;

    return 0;