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

Commit 2c805883 authored by Christopher Ferris's avatar Christopher Ferris Committed by Gerrit Code Review
Browse files

Merge "Add -Wno-deprecated-declarations to makefiles."

parents 299a32c8 51448eb3

adb/Android.mk

+10 −2
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ ifeq ($(USE_SYSDEPS_WIN32),) 
	LOCAL_STATIC_LIBRARIES += libcutils

endif



LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk

include $(BUILD_HOST_EXECUTABLE)



$(call dist-for-goals,dist_files sdk,$(LOCAL_BUILT_MODULE))
@@ -116,8 +117,13 @@ LOCAL_SRC_FILES := \ 
	remount_service.c \

	usb_linux_client.c



LOCAL_CFLAGS := -O2 -g -DADB_HOST=0 -Wall -Wno-unused-parameter -Werror

LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE

LOCAL_CFLAGS := \

	-O2 \

	-g \

	-DADB_HOST=0 \

	-D_XOPEN_SOURCE \

	-D_GNU_SOURCE \

	-Wall -Wno-unused-parameter -Werror -Wno-deprecated-declarations \



ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))

LOCAL_CFLAGS += -DALLOW_ADBD_ROOT=1
@@ -130,6 +136,7 @@ LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT_SBIN) 
LOCAL_UNSTRIPPED_PATH := $(TARGET_ROOT_OUT_SBIN_UNSTRIPPED)



LOCAL_STATIC_LIBRARIES := liblog libcutils libc libmincrypt libselinux

LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk

include $(BUILD_EXECUTABLE)
@@ -172,5 +179,6 @@ LOCAL_STATIC_LIBRARIES := libzipfile libunz libcutils 


LOCAL_SHARED_LIBRARIES := libcrypto



LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk

include $(BUILD_EXECUTABLE)

endif

fastbootd/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ LOCAL_SRC_FILES := \ 


LOCAL_MODULE := fastbootd

LOCAL_MODULE_TAGS := optional

LOCAL_CFLAGS := -Wall -Werror -Wno-unused-parameter -DFLASH_CERT

LOCAL_CFLAGS := -Wall -Werror -Wno-unused-parameter -Wno-deprecated-declarations -DFLASH_CERT

LOCAL_LDFLAGS := -ldl



LOCAL_STATIC_LIBRARIES := \