Merge "Convert system_compatibility_matrix.xml to soong" into main

This commit is contained in:
Treehugger Robot 2024-06-05 03:10:03 +00:00 committed by Gerrit Code Review
commit bf5b700570
2 changed files with 22 additions and 9 deletions

View file

@ -92,3 +92,25 @@ vintf_compatibility_matrix {
],
}
// Phony target that installs all system compatibility matrix files
SYSTEM_MATRIX_DEPS = [
"framework_compatibility_matrix.5.xml",
"framework_compatibility_matrix.6.xml",
"framework_compatibility_matrix.7.xml",
"framework_compatibility_matrix.8.xml",
"framework_compatibility_matrix.202404.xml",
"framework_compatibility_matrix.device.xml",
]
phony {
name: "system_compatibility_matrix.xml",
required: SYSTEM_MATRIX_DEPS,
product_variables: {
release_aidl_use_unfrozen: {
required: [
"framework_compatibility_matrix.202504.xml",
],
},
},
}

View file

@ -119,15 +119,6 @@ endif
my_framework_matrix_deps += \
$(my_system_matrix_deps)
# Phony target that installs all system compatibility matrix files
include $(CLEAR_VARS)
LOCAL_MODULE := system_compatibility_matrix.xml
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE
LOCAL_REQUIRED_MODULES := $(my_system_matrix_deps)
include $(BUILD_PHONY_PACKAGE)
# Phony target that installs all framework compatibility matrix files (system + product)
include $(CLEAR_VARS)
LOCAL_MODULE := framework_compatibility_matrix.xml