diff options
| -rw-r--r-- | core/Makefile | 43 | ||||
| -rw-r--r-- | core/shell_test_config_template.xml | 30 |
2 files changed, 44 insertions, 29 deletions
diff --git a/core/Makefile b/core/Makefile index d2dcda4139..cbdf8e161c 100644 --- a/core/Makefile +++ b/core/Makefile @@ -2235,52 +2235,37 @@ define build-recoveryimage-target $(AVBTOOL) add_hash_footer --image $(1) --partition_size $(BOARD_RECOVERYIMAGE_PARTITION_SIZE) --partition_name recovery $(INTERNAL_AVB_RECOVERY_SIGNING_ARGS) $(BOARD_AVB_RECOVERY_ADD_HASH_FOOTER_ARGS))) endef -ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true) +recoveryimage-deps := $(MKBOOTIMG) $(recovery_ramdisk) $(recovery_kernel) ifeq (true,$(PRODUCT_SUPPORTS_BOOT_SIGNER)) -$(INSTALLED_BOOTIMAGE_TARGET) : $(BOOT_SIGNER) + recoveryimage-deps += $(BOOT_SIGNER) endif ifeq (true,$(PRODUCT_SUPPORTS_VBOOT)) -$(INSTALLED_BOOTIMAGE_TARGET) : $(VBOOT_SIGNER) + recoveryimage-deps += $(VBOOT_SIGNER) endif ifeq (true,$(BOARD_AVB_ENABLE)) -$(INSTALLED_BOOTIMAGE_TARGET) : $(AVBTOOL) $(BOARD_AVB_BOOT_KEY_PATH) + recoveryimage-deps += $(AVBTOOL) $(BOARD_AVB_BOOT_KEY_PATH) endif ifdef BOARD_INCLUDE_RECOVERY_DTBO -ifdef BOARD_PREBUILT_RECOVERY_DTBOIMAGE -$(INSTALLED_BOOTIMAGE_TARGET): $(BOARD_PREBUILT_RECOVERY_DTBOIMAGE) -else -$(INSTALLED_BOOTIMAGE_TARGET): $(BOARD_PREBUILT_DTBOIMAGE) -endif + ifdef BOARD_PREBUILT_RECOVERY_DTBOIMAGE + recoveryimage-deps += $(BOARD_PREBUILT_RECOVERY_DTBOIMAGE) + else + recoveryimage-deps += $(BOARD_PREBUILT_DTBOIMAGE) + endif endif ifdef BOARD_INCLUDE_RECOVERY_ACPIO -$(INSTALLED_BOOTIMAGE_TARGET): $(BOARD_RECOVERY_ACPIO) + recoveryimage-deps += $(BOARD_RECOVERY_ACPIO) endif ifdef BOARD_INCLUDE_DTB_IN_BOOTIMG -$(INSTALLED_BOOTIMAGE_TARGET): $(INSTALLED_DTBIMAGE_TARGET) + recoveryimage-deps += $(INSTALLED_DTBIMAGE_TARGET) endif -$(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(recovery_ramdisk) \ - $(recovery_kernel) +ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true) +$(INSTALLED_BOOTIMAGE_TARGET): $(recoveryimage-deps) $(call pretty,"Target boot image from recovery: $@") $(call build-recoveryimage-target, $@, $(PRODUCT_OUT)/$(subst .img,,$(subst boot,kernel,$(notdir $@)))) endif # BOARD_USES_RECOVERY_AS_BOOT -ifdef BOARD_INCLUDE_RECOVERY_DTBO -ifdef BOARD_PREBUILT_RECOVERY_DTBOIMAGE -$(INSTALLED_RECOVERYIMAGE_TARGET): $(BOARD_PREBUILT_RECOVERY_DTBOIMAGE) -else -$(INSTALLED_RECOVERYIMAGE_TARGET): $(BOARD_PREBUILT_DTBOIMAGE) -endif -endif -ifdef BOARD_INCLUDE_RECOVERY_ACPIO -$(INSTALLED_RECOVERYIMAGE_TARGET): $(BOARD_RECOVERY_ACPIO) -endif -ifdef BOARD_INCLUDE_DTB_IN_BOOTIMG -$(INSTALLED_RECOVERYIMAGE_TARGET): $(INSTALLED_DTBIMAGE_TARGET) -endif - -$(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTIMG) $(recovery_ramdisk) \ - $(recovery_kernel) +$(INSTALLED_RECOVERYIMAGE_TARGET): $(recoveryimage-deps) $(call build-recoveryimage-target, $@, $(recovery_kernel)) ifdef RECOVERY_RESOURCE_ZIP diff --git a/core/shell_test_config_template.xml b/core/shell_test_config_template.xml new file mode 100644 index 0000000000..5e1c8eecee --- /dev/null +++ b/core/shell_test_config_template.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2020 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<!-- This test config file is auto-generated. --> +<configuration description="Config for running {MODULE} through Atest or in Infra"> + <option name="test-suite-tag" value="{MODULE}" /> + + {EXTRA_CONFIGS} + + <!-- This test requires a device, so it's not annotated with a null-device. --> + <test class="com.android.tradefed.testtype.binary.ExecutableHostTest" > + <option name="binary" value="{OUTPUT_FILENAME}" /> + <!-- Test script assumes a relative path with the tests/ folders. --> + <option name="relative-path-execution" value="true" /> + <!-- Tests shouldn't be that long but set 15m to be safe. --> + <option name="per-binary-timeout" value="15m" /> + </test> +</configuration>
\ No newline at end of file |