ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Christopher Ferris 2014-09-06 16:56:46 +00:00 • committed by Gerrit Code Review
commit 2c80588340
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
adb/Android.mk
View file

@ -85,6 +85,7 @@ ifeq ($(USE_SYSDEPS_WIN32),)
LOCAL_STATIC_LIBRARIES += libcutils LOCAL_STATIC_LIBRARIES += libcutils
endif endif
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
include $(BUILD_HOST_EXECUTABLE) include $(BUILD_HOST_EXECUTABLE)
$(call dist-for-goals,dist_files sdk,$(LOCAL_BUILT_MODULE)) $(call dist-for-goals,dist_files sdk,$(LOCAL_BUILT_MODULE))
@ -116,8 +117,13 @@ LOCAL_SRC_FILES := \
remount_service.c \ remount_service.c \
usb_linux_client.c usb_linux_client.c
LOCAL_CFLAGS := -O2 -g -DADB_HOST=0 -Wall -Wno-unused-parameter -Werror LOCAL_CFLAGS := \
LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE -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))) ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
LOCAL_CFLAGS += -DALLOW_ADBD_ROOT=1 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_UNSTRIPPED_PATH := $(TARGET_ROOT_OUT_SBIN_UNSTRIPPED)
LOCAL_STATIC_LIBRARIES := liblog libcutils libc libmincrypt libselinux LOCAL_STATIC_LIBRARIES := liblog libcutils libc libmincrypt libselinux
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)
@ -172,5 +179,6 @@ LOCAL_STATIC_LIBRARIES := libzipfile libunz libcutils
LOCAL_SHARED_LIBRARIES := libcrypto LOCAL_SHARED_LIBRARIES := libcrypto
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)
endif endif

2
fastbootd/Android.mk
View file

@ -42,7 +42,7 @@ LOCAL_SRC_FILES := \
LOCAL_MODULE := fastbootd LOCAL_MODULE := fastbootd
LOCAL_MODULE_TAGS := optional 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_LDFLAGS := -ldl
LOCAL_STATIC_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := \