Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b30e92b3 authored by Yi Kong's avatar Yi Kong Committed by Automerger Merge Worker
Browse files

Merge "Rename modulesAddedWall to modulesWarningsAllowed" am: 05b22179 am: 57e3ba80 

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



Change-Id: Ib5fb1502c8503c902492b971938b50970361a31c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ff333b1d 57e3ba80

core/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -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))

core/binary.mk

+1 −1
Original line number Diff line number Diff line
@@ -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