Merge "No need to dump modules added -Werror."
This commit is contained in:
commit
531ce804ea
|
@ -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
|
||||
|
||||
|
|
|
@ -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))
|
||||
|
|
Loading…
Reference in New Issue