diff options
| -rw-r--r-- | Deprecation.md | 1 | ||||
| -rw-r--r-- | core/Makefile | 16 | ||||
| -rw-r--r-- | core/config.mk | 9 | ||||
| -rw-r--r-- | core/deprecation.mk | 2 | ||||
| -rw-r--r-- | target/board/BoardConfigEmuCommon.mk | 5 | ||||
| -rwxr-xr-x | tools/releasetools/merge_target_files.py | 4 |
6 files changed, 30 insertions, 7 deletions
diff --git a/Deprecation.md b/Deprecation.md index 131ec0d11d..9378e1acfd 100644 --- a/Deprecation.md +++ b/Deprecation.md @@ -19,6 +19,7 @@ have any problems converting, please contact us via: | `BUILD_HOST_FUZZ_TEST` | Error | | `BUILD_HOST_NATIVE_TEST` | Error | | `BUILD_HOST_SHARED_TEST_LIBRARY` | Error | +| `BUILD_HOST_STATIC_LIBRARY` | Warning | | `BUILD_HOST_STATIC_TEST_LIBRARY` | Error | | `BUILD_HOST_TEST_CONFIG` | Error | | `BUILD_NATIVE_BENCHMARK` | Error | diff --git a/core/Makefile b/core/Makefile index 7a04f8ae0c..83021d4ee0 100644 --- a/core/Makefile +++ b/core/Makefile @@ -3429,6 +3429,10 @@ ifndef BOARD_SUPER_PARTITION_WARN_LIMIT BOARD_SUPER_PARTITION_WARN_LIMIT := $$(($(BOARD_SUPER_PARTITION_SIZE) * 95 / 100)) endif +ifndef BOARD_SUPER_PARTITION_ERROR_LIMIT +BOARD_SUPER_PARTITION_ERROR_LIMIT := $(BOARD_SUPER_PARTITION_SIZE) +endif + droid_targets: check-all-partition-sizes .PHONY: check-all-partition-sizes check-all-partition-sizes-nodeps @@ -3465,6 +3469,8 @@ endif # $(3): list of partition names # $(4): human-readable warn size string # $(5): warn size expression +# $(6): human readable error size string +# $(7): error size expression define check-sum-of-partition-sizes partition_size_list="$$(for i in $(call read-size-of-partitions,$(3)); do \ echo $(call round-partition-size,$${i}); \ @@ -3475,6 +3481,12 @@ define check-sum-of-partition-sizes echo $${sum_sizes_expr} '==' $$(( $${sum_sizes_expr} )) '>' "$(2)" '==' $$(( $(2) )); \ exit 1; \ else \ + if [[ ! -z "$(7)" ]] && [ $$(( $${sum_sizes_expr} )) -gt $$(( $(7) )) ]; then \ + echo "!!!! ERROR !!!! The sum of sizes of [$(strip $(3))] is larger than $(strip $(6)):"; \ + echo $${sum_sizes_expr} '==' $$(( $${sum_sizes_expr} )) '>' "$(7)" '==' $$(( $(7) )); \ + echo "Super partition is" $$(( $$(( $$(( $${sum_sizes_expr} )) * 100)) / $$(( $(2) )) )) "percent occupied!"; \ + exit 1; \ + fi; \ if [[ ! -z "$(5)" ]] && [ $$(( $${sum_sizes_expr} )) -gt $$(( $(5) )) ]; then \ echo "!!!! WARNING !!!! The sum of sizes of [$(strip $(3))] is larger than $(strip $(4)):"; \ echo $${sum_sizes_expr} '==' $$(( $${sum_sizes_expr} )) '>' "$(5)" '==' $$(( $(5) )); \ @@ -3491,7 +3503,9 @@ define check-all-partition-sizes-target $(call check-sum-of-partition-sizes,BOARD_SUPER_PARTITION_SIZE$(if $(call super-slot-suffix), / 2), \ $(BOARD_SUPER_PARTITION_SIZE)$(if $(call super-slot-suffix), / 2),$(BOARD_SUPER_PARTITION_PARTITION_LIST), \ BOARD_SUPER_PARTITION_WARN_LIMIT$(if $(call super-slot-suffix), / 2), \ - $(BOARD_SUPER_PARTITION_WARN_LIMIT)$(if $(call super-slot-suffix), / 2)) \ + $(BOARD_SUPER_PARTITION_WARN_LIMIT)$(if $(call super-slot-suffix), / 2), \ + BOARD_SUPER_PARTITION_ERROR_LIMIT$(if $(call super-slot-suffix), / 2), \ + $(BOARD_SUPER_PARTITION_ERROR_LIMIT)$(if $(call super-slot-suffix), / 2)) \ )) # For each group, check sum(partitions in group) <= group size diff --git a/core/config.mk b/core/config.mk index a3365d279a..92efd34147 100644 --- a/core/config.mk +++ b/core/config.mk @@ -926,10 +926,6 @@ BOARD_SUPER_PARTITION_PARTITION_LIST := \ $(BOARD_$(group)_PARTITION_LIST)) .KATI_READONLY := BOARD_SUPER_PARTITION_PARTITION_LIST -endif # PRODUCT_USE_DYNAMIC_PARTITIONS - -ifeq ($(PRODUCT_BUILD_SUPER_PARTITION),true) - ifneq ($(BOARD_SUPER_PARTITION_SIZE),) ifeq ($(PRODUCT_RETROFIT_DYNAMIC_PARTITIONS),true) @@ -989,8 +985,11 @@ BOARD_BUILD_RETROFIT_DYNAMIC_PARTITIONS_OTA_PACKAGE := endif # PRODUCT_RETROFIT_DYNAMIC_PARTITIONS endif # BOARD_SUPER_PARTITION_SIZE +BOARD_SUPER_PARTITION_BLOCK_DEVICES ?= .KATI_READONLY := BOARD_SUPER_PARTITION_BLOCK_DEVICES +BOARD_SUPER_PARTITION_METADATA_DEVICE ?= .KATI_READONLY := BOARD_SUPER_PARTITION_METADATA_DEVICE +BOARD_BUILD_RETROFIT_DYNAMIC_PARTITIONS_OTA_PACKAGE ?= .KATI_READONLY := BOARD_BUILD_RETROFIT_DYNAMIC_PARTITIONS_OTA_PACKAGE $(foreach device,$(call to-upper,$(BOARD_SUPER_PARTITION_BLOCK_DEVICES)), \ @@ -999,7 +998,7 @@ $(foreach device,$(call to-upper,$(BOARD_SUPER_PARTITION_BLOCK_DEVICES)), \ $(error BOARD_SUPER_PARTITION_$(device)_DEVICE_SIZE must not be empty)) \ $(eval .KATI_READONLY := BOARD_SUPER_PARTITION_$(device)_DEVICE_SIZE)) -endif # PRODUCT_BUILD_SUPER_PARTITION +endif # PRODUCT_USE_DYNAMIC_PARTITIONS # ############################################################### # Set up final options. diff --git a/core/deprecation.mk b/core/deprecation.mk index f1e198d518..761a9b6e52 100644 --- a/core/deprecation.mk +++ b/core/deprecation.mk @@ -10,7 +10,6 @@ AVAILABLE_BUILD_MODULE_TYPES :=$= \ BUILD_HOST_JAVA_LIBRARY \ BUILD_HOST_PREBUILT \ BUILD_HOST_SHARED_LIBRARY \ - BUILD_HOST_STATIC_LIBRARY \ BUILD_JAVA_LIBRARY \ BUILD_MULTI_PREBUILT \ BUILD_NATIVE_TEST \ @@ -28,6 +27,7 @@ AVAILABLE_BUILD_MODULE_TYPES :=$= \ # relevant BUILD_BROKEN_USES_BUILD_* variables, then these would move to # DEFAULT_ERROR_BUILD_MODULE_TYPES. DEFAULT_WARNING_BUILD_MODULE_TYPES :=$= \ + BUILD_HOST_STATIC_LIBRARY \ # These are BUILD_* variables that are errors to reference, but you can set # BUILD_BROKEN_USES_BUILD_* in your BoardConfig.mk in order to turn them back diff --git a/target/board/BoardConfigEmuCommon.mk b/target/board/BoardConfigEmuCommon.mk index 3ab5f12d5a..ac21918022 100644 --- a/target/board/BoardConfigEmuCommon.mk +++ b/target/board/BoardConfigEmuCommon.mk @@ -41,6 +41,11 @@ ifeq ($(PRODUCT_USE_DYNAMIC_PARTITIONS),true) # 3G BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE := 3221225472 + + # in build environment to speed up make -j + ifeq ($(QEMU_DISABLE_AVB),true) + BOARD_AVB_ENABLE := false + endif else ifeq ($(PRODUCT_USE_DYNAMIC_PARTITION_SIZE),true) # Enable dynamic system image size and reserved 64MB in it. BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 67108864 diff --git a/tools/releasetools/merge_target_files.py b/tools/releasetools/merge_target_files.py index f37c0ee1bc..f0ae217171 100755 --- a/tools/releasetools/merge_target_files.py +++ b/tools/releasetools/merge_target_files.py @@ -530,6 +530,10 @@ def process_misc_info_txt(framework_target_files_temp_dir, list_prefix='super_', list_suffix='_partition_list') merged_dict.update(merged_dynamic_partitions_dict) + # Ensure that add_img_to_target_files rebuilds super_empty.img. This flag + # may have been set to false in the partial builds to prevent duplicate + # building of super.img and super_empty.img. + merged_dict['build_super_partition'] = 'true' # Replace <image>_selinux_fc values with framework or vendor file_contexts.bin # depending on which dictionary the key came from. |