From eb5b983d015c11cbe396c23d7e2a54c66eea7c8d Mon Sep 17 00:00:00 2001
From: yangbill <yangbill@google.com>
Date: Fri, 24 May 2024 10:44:52 +0000
Subject: [PATCH] Convert system_compatibility_matrix.xml to soong

Bug: 342336921
Test: m system_compatibility_matrix.xml
Test: Modified build/release/flag_declarations/RELEASE_AIDL_USE_UNFROZEN.textproto \
      m system_compatibility_matrix.xml

Change-Id: I181c2054adb187332b3feb634e309a3e75425611
---
 compatibility_matrices/Android.bp | 22 ++++++++++++++++++++++
 compatibility_matrices/Android.mk |  9 ---------
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/compatibility_matrices/Android.bp b/compatibility_matrices/Android.bp
index 951ca850b4..ad42015156 100644
--- a/compatibility_matrices/Android.bp
+++ b/compatibility_matrices/Android.bp
@@ -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",
+            ],
+        },
+    },
+}
diff --git a/compatibility_matrices/Android.mk b/compatibility_matrices/Android.mk
index ab57b8c875..338c075c02 100644
--- a/compatibility_matrices/Android.mk
+++ b/compatibility_matrices/Android.mk
@@ -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