diff options
| author | Christopher Ferris <cferris@google.com> | 2014-09-06 16:56:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-06 16:56:46 +0000 |
| commit | 2c805883408339823d3f3ca23aceb08a1783ebbd (patch) | |
| tree | 24a12af0cbddb8910270f7e358bf430ba3b5bef8 | |
| parent | 299a32c8038d4152b302948e5b961f2fcc04f6b2 (diff) | |
| parent | 51448eb39ef28b6c0314668ce22aa1f4aa116e8d (diff) | |
| download | system_core-2c805883408339823d3f3ca23aceb08a1783ebbd.zip system_core-2c805883408339823d3f3ca23aceb08a1783ebbd.tar.gz system_core-2c805883408339823d3f3ca23aceb08a1783ebbd.tar.bz2 | |
Merge "Add -Wno-deprecated-declarations to makefiles."
| -rw-r--r-- | adb/Android.mk | 12 | ||||
| -rw-r--r-- | fastbootd/Android.mk | 2 |
2 files changed, 11 insertions, 3 deletions
diff --git a/adb/Android.mk b/adb/Android.mk index 80c1f9c..a82f026 100644 --- a/adb/Android.mk +++ b/adb/Android.mk @@ -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 diff --git a/fastbootd/Android.mk b/fastbootd/Android.mk index 6aa7400..bccac68 100644 --- a/fastbootd/Android.mk +++ b/fastbootd/Android.mk @@ -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 := \ |