From ab149cbda095de90035e7ac5cb250d77d143eece Mon Sep 17 00:00:00 2001 From: Chih-Hung Hsieh Date: Mon, 4 Dec 2017 15:23:37 -0800 Subject: [PATCH] No need to dump modules added -Werror. * This reduces size of output file wall_werror.txt. * Stop collecting $(MODULES_ADDED_WERROR) Bug: 66996870 Test: normal build Change-Id: Id750cc7fe6489a7654b20740d503226ec6941bbb --- core/Makefile | 2 -- core/binary.mk | 1 - 2 files changed, 3 deletions(-) diff --git a/core/Makefile b/core/Makefile index c90fae5a0..d92859ed9 100644 --- a/core/Makefile +++ b/core/Makefile @@ -536,8 +536,6 @@ $(WALL_WERROR): @rm -f $@ echo "# Modules using -Wno-error" >> $@ for m in $(sort $(SOONG_MODULES_USING_WNO_ERROR) $(MODULES_USING_WNO_ERROR)); do echo $$m >> $@; done - echo "# Modules added default -Wall -Werror" >> $@ - for m in $(sort $(SOONG_MODULES_ADDED_WERROR) $(MODULES_ADDED_WERROR)); do echo $$m >> $@; done echo "# Modules added default -Wall" >> $@ for m in $(sort $(SOONG_MODULES_ADDED_WALL) $(MODULES_ADDED_WALL)); do echo $$m >> $@; done diff --git a/core/binary.mk b/core/binary.mk index bf2e93b44..6b65b6c2a 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -1696,7 +1696,6 @@ ifneq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK)) ifeq (,$(filter -Werror,$(my_all_cflags))) # Add -Wall -Werror unless the project is in the WARNING_ALLOWED project list. ifeq (,$(strip $(call find_warning_allowed_projects,$(LOCAL_PATH)))) - $(eval MODULES_ADDED_WERROR := $(MODULES_ADDED_WERROR) $(LOCAL_MODULE_MAKEFILE):$(LOCAL_MODULE)) my_cflags := -Wall -Werror $(my_cflags) else $(eval MODULES_ADDED_WALL := $(MODULES_ADDED_WALL) $(LOCAL_MODULE_MAKEFILE):$(LOCAL_MODULE))