StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move check-all-partition-sizes to a non-phony rule"

Browse Source 
am: 2ee5efd824

Change-Id: Ib99995a72e3c1199797cc36c2c1094b015fd4487
This commit is contained in:
Colin Cross
2019-05-20 17:07:14 -07:00
committed by android-build-merger
parent ab5c9cdbb1 2ee5efd824
commit 468549471a
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/Makefile
View File

@@ -3381,8 +3381,12 @@ droid_targets: check-all-partition-sizes
.PHONY: check-all-partition-sizes check-all-partition-sizes-nodeps .PHONY: check-all-partition-sizes check-all-partition-sizes-nodeps
check_all_partition_sizes_file := $(call intermediates-dir-for,PACKAGING,check-all-partition-sizes)/timestamp
check-all-partition-sizes: $(check_all_partition_sizes_file)
# Add image dependencies so that generated_*_image_info.txt are written before checking. # Add image dependencies so that generated_*_image_info.txt are written before checking.
check-all-partition-sizes: \ $(check_all_partition_sizes_file): \
build/make/tools/releasetools/sparse_img.py \ build/make/tools/releasetools/sparse_img.py \
$(call images-for-partitions,$(BOARD_SUPER_PARTITION_PARTITION_LIST)) $(call images-for-partitions,$(BOARD_SUPER_PARTITION_PARTITION_LIST))
@@ -3450,7 +3454,12 @@ define check-all-partition-sizes-target
fi fi
endef endef
check-all-partition-sizes check-all-partition-sizes-nodeps: $(check_all_partition_sizes_file):
$(call check-all-partition-sizes-target)
$(call check-super-partition-size)
touch $@
check-all-partition-sizes-nodeps:
$(call check-all-partition-sizes-target) $(call check-all-partition-sizes-target)
$(call check-super-partition-size) $(call check-super-partition-size)