From e93068e6ca6a2a8d93a3d2fc83c52b5cffad8787 Mon Sep 17 00:00:00 2001 From: bowenlai Date: Tue, 22 Oct 2024 16:59:20 +0800 Subject: [PATCH] Rename aocx.IAoc to aocx.IAoc/default to support stable AIDL Also add framework_compatibility_matrix.xml for aoc stable AIDL Bug: 380993517 Flag: EXEMPT HAL interface change Test: local build Change-Id: I8a41ff1bdd4ffc8e5d7da08879738aa11fb81813 --- aoc/aoc.mk | 5 +++++ aoc/sepolicy/service_contexts | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/aoc/aoc.mk b/aoc/aoc.mk index 9ee4517..13d849c 100644 --- a/aoc/aoc.mk +++ b/aoc/aoc.mk @@ -13,6 +13,11 @@ PRODUCT_COPY_FILES += \ device/google/gs-common/aoc/conf/init.aoc.daemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.aoc.rc endif +ifneq ($(wildcard vendor/google/whitechapel/aoc/aocx/aidl/aocx/framework_compatibility_matrix.xml),) +DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE += \ + vendor/google/whitechapel/aoc/aocx/aidl/aocx/framework_compatibility_matrix.xml +endif + # AoC debug support PRODUCT_PACKAGES_DEBUG += \ aocdump \ diff --git a/aoc/sepolicy/service_contexts b/aoc/sepolicy/service_contexts index de31e51..80346c8 100644 --- a/aoc/sepolicy/service_contexts +++ b/aoc/sepolicy/service_contexts @@ -1 +1 @@ -aocx.IAocx u:object_r:aocx:s0 +aocx.IAocx/default u:object_r:aocx:s0