Merge "[conflict] Merge "Rename compatibility_matrix.9.xml to compatibility_matrix.202404.xml" into main am: 89c395a850
am: 9862527094
am: e346798006" into main
This commit is contained in:
commit
eb85ecda06
3 changed files with 5 additions and 5 deletions
|
@ -84,10 +84,10 @@ vintf_compatibility_matrix {
|
|||
}
|
||||
|
||||
vintf_compatibility_matrix {
|
||||
name: "framework_compatibility_matrix.9.xml",
|
||||
stem: "compatibility_matrix.9.xml",
|
||||
name: "framework_compatibility_matrix.202404.xml",
|
||||
stem: "compatibility_matrix.202404.xml",
|
||||
srcs: [
|
||||
"compatibility_matrix.9.xml",
|
||||
"compatibility_matrix.202404.xml",
|
||||
],
|
||||
kernel_configs: [
|
||||
"kernel_config_v_6.1",
|
||||
|
|
|
@ -112,7 +112,7 @@ my_system_matrix_deps := \
|
|||
# interfaces (in the `next` release configuration).
|
||||
ifeq ($(RELEASE_AIDL_USE_UNFROZEN),true)
|
||||
my_system_matrix_deps += \
|
||||
framework_compatibility_matrix.9.xml
|
||||
framework_compatibility_matrix.202404.xml
|
||||
endif
|
||||
|
||||
my_framework_matrix_deps += \
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<compatibility-matrix version="1.0" type="framework" level="9">
|
||||
<compatibility-matrix version="1.0" type="framework" level="202404">
|
||||
<hal format="aidl" optional="true">
|
||||
<name>android.hardware.audio.core</name>
|
||||
<version>1-2</version>
|
Loading…
Reference in a new issue