From 774c2bfcca145aa461f519b138f76b67a35d6e7f Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Mon, 11 Jun 2018 18:07:53 -0700 Subject: [PATCH] Do not install assembled framework matrix to device. Test: `m` dist Test: make system matrix incompatible, `m` dist fails Test: `m` and /system/etc/vintf files are installed Bug: 110056937 Change-Id: If0bf2023f48ef31fffaf8636b3893cbfb40270ee --- compatibility_matrices/Android.mk | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/compatibility_matrices/Android.mk b/compatibility_matrices/Android.mk index 6446beb3a4..cadf85b4c8 100644 --- a/compatibility_matrices/Android.mk +++ b/compatibility_matrices/Android.mk @@ -115,19 +115,25 @@ LOCAL_ASSEMBLE_VINTF_ENV_VARS := \ include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX) -# Framework Compatibility Matrix - -include $(CLEAR_VARS) -include $(LOCAL_PATH)/clear_vars.mk -LOCAL_MODULE := framework_compatibility_matrix.xml -LOCAL_MODULE_STEM := compatibility_matrix.xml -LOCAL_MODULE_PATH := $(TARGET_OUT) -LOCAL_REQUIRED_MODULES := \ +my_system_matrix_deps := \ framework_compatibility_matrix.legacy.xml \ framework_compatibility_matrix.1.xml \ framework_compatibility_matrix.2.xml \ framework_compatibility_matrix.current.xml \ framework_compatibility_matrix.device.xml + +# Phony target that installs all framework compatibility matrix files +include $(CLEAR_VARS) +LOCAL_MODULE := framework_compatibility_matrix.xml +LOCAL_REQUIRED_MODULES := $(my_system_matrix_deps) +include $(BUILD_PHONY_PACKAGE) + +# Final Framework Compatibility Matrix +include $(CLEAR_VARS) +include $(LOCAL_PATH)/clear_vars.mk +LOCAL_MODULE := verified_assembled_system_matrix.xml +LOCAL_MODULE_PATH := $(PRODUCT_OUT) +LOCAL_REQUIRED_MODULES := $(my_system_matrix_deps) LOCAL_GENERATED_SOURCES := $(call module-installed-files,$(LOCAL_REQUIRED_MODULES)) ifdef BUILT_VENDOR_MANIFEST @@ -138,4 +144,5 @@ endif include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX) BUILT_SYSTEM_MATRIX := $(LOCAL_BUILT_MODULE) +my_system_matrix_deps := BUILD_FRAMEWORK_COMPATIBILITY_MATRIX :=