From 62d0a739bbce94f3f3721e036ca9b2df94e18ba1 Mon Sep 17 00:00:00 2001 From: Devin Moore Date: Thu, 13 Oct 2022 16:50:50 +0000 Subject: [PATCH] Restrict the framework manifest check against frozen files This only needs to be done for GSI targets that need to remain compatible with previously frozen manifests so they continue to work for older upgrading devices. Test: lunch aosp_cf_x86_64_phone && m Test: lunch aosp_arm64 && m Test: both tests with and without android.hidl.manager served on device Bug: 218588089 Change-Id: I34862b08cd4ba4c554b5fe9db0eeacba60a0c33a --- core/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/Makefile b/core/Makefile index 198beb1a53..645c9ef989 100644 --- a/core/Makefile +++ b/core/Makefile @@ -4608,7 +4608,10 @@ $(check_vintf_system_log): $(HOST_OUT_EXECUTABLES)/checkvintf $(check_vintf_syst $(call declare-0p-target,$(check_vintf_system_log)) check_vintf_system_log := -vintffm_log := $(intermediates)/vintffm.log +# -- Check framework manifest against frozen manifests for GSI targets. They need to be compatible. +ifneq (true, $(BUILDING_VENDOR_IMAGE)) + vintffm_log := $(intermediates)/vintffm.log +endif check_vintf_all_deps += $(vintffm_log) $(vintffm_log): $(HOST_OUT_EXECUTABLES)/vintffm $(check_vintf_system_deps) @( $< --check --dirmap /system:$(TARGET_OUT) \