Merge "Rename modulesAddedWall to modulesWarningsAllowed" am: 05b2217940

Original change: https://android-review.googlesource.com/c/platform/build/+/2100875

Change-Id: I184dae6303b71e0546e3e06a0714e680090a2302
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yi Kong
2022-05-20 00:29:10 +00:00
committed by Automerger Merge Worker
2 changed files with 3 additions and 3 deletions

View File

@@ -694,8 +694,8 @@ $(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" >> $@
for m in $(sort $(SOONG_MODULES_ADDED_WALL) $(MODULES_ADDED_WALL)); do echo $$m >> $@; done
echo "# Modules that allow warnings" >> $@
for m in $(sort $(SOONG_MODULES_WARNINGS_ALLOWED) $(MODULES_WARNINGS_ALLOWED)); do echo $$m >> $@; done
$(call declare-0p-target,$(WALL_WERROR))

View File

@@ -1506,7 +1506,7 @@ ifneq (HEADER_LIBRARIES,$(LOCAL_MODULE_CLASS))
ifeq (,$(strip $(call find_warning_allowed_projects,$(LOCAL_PATH))))
my_cflags := -Wall -Werror $(my_cflags)
else
$(eval MODULES_ADDED_WALL := $(MODULES_ADDED_WALL) $(LOCAL_MODULE_MAKEFILE):$(LOCAL_MODULE))
$(eval MODULES_WARNINGS_ALLOWED := $(MODULES_USING_WNO_ERROR) $(LOCAL_MODULE_MAKEFILE):$(LOCAL_MODULE))
my_cflags := -Wall $(my_cflags)
endif
endif