From 7eef112eb1f44f8e08c1449daf41fd71315564e7 Mon Sep 17 00:00:00 2001 From: Jihoon Kang Date: Thu, 29 Aug 2024 22:12:38 +0000 Subject: [PATCH] Define additional non-vendor non-aosp container violations These internal only violations are non-vendor. Without these allowlist entries, branches without vendor will emit container violation errors given that the internal allowlist is included in vendor/google/release project. Ignore-AOSP-First: Intended internal only change Test: m nothing Bug: 338660802 Change-Id: I417880c1689390ebdc9caabef705bce739bb0baf --- android/container_violations.go | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/android/container_violations.go b/android/container_violations.go index 42514849e..efbc8da1a 100644 --- a/android/container_violations.go +++ b/android/container_violations.go @@ -15,6 +15,10 @@ package android var ContainerDependencyViolationAllowlist = map[string][]string{ + "adservices-service-core": { + "gson", // apex [com.android.adservices, com.android.extservices] -> apex [com.android.virt] + }, + "android.car-module.impl": { "modules-utils-preconditions", // apex [com.android.car.framework] -> apex [com.android.adservices, com.android.appsearch, com.android.cellbroadcast, com.android.extservices, com.android.ondevicepersonalization, com.android.tethering, com.android.uwb, com.android.wifi, test_com.android.cellbroadcast, test_com.android.wifi] }, @@ -46,6 +50,11 @@ var ContainerDependencyViolationAllowlist = map[string][]string{ "modules-utils-shell-command-handler", // apex [com.android.car.framework] -> apex [com.android.adservices, com.android.art, com.android.art.debug, com.android.art.testing, com.android.btservices, com.android.configinfrastructure, com.android.mediaprovider, com.android.nfcservices, com.android.permission, com.android.scheduling, com.android.tethering, com.android.uwb, com.android.wifi, test_com.android.mediaprovider, test_com.android.permission, test_com.android.wifi, test_imgdiag_com.android.art, test_jitzygote_com.android.art] }, + "cellbroadcastreceiver_aconfig_flags_lib": { + "ext", // apex [com.android.cellbroadcast, test_com.android.cellbroadcast] -> system + "framework", // apex [com.android.cellbroadcast, test_com.android.cellbroadcast] -> system + }, + "connectivity-net-module-utils-bpf": { "net-utils-device-common-struct-base", // apex [com.android.tethering] -> system }, @@ -161,6 +170,10 @@ var ContainerDependencyViolationAllowlist = map[string][]string{ "framework", // cts -> unstable }, + "CtsAppFunctionTestCases": { + "framework", // cts -> unstable + }, + "CtsAppOpsTestCases": { "framework", // cts -> unstable }, @@ -701,6 +714,10 @@ var ContainerDependencyViolationAllowlist = map[string][]string{ "framework", // cts -> unstable }, + "CtsTvInputTestCases": { + "framework", // cts -> unstable + }, + "CtsTvTunerTestCases": { "framework", // cts -> unstable }, @@ -822,6 +839,10 @@ var ContainerDependencyViolationAllowlist = map[string][]string{ "app-compat-annotations", // apex [com.android.btservices] -> system }, + "framework-configinfrastructure.impl": { + "configinfra_framework_flags_java_lib", // apex [com.android.configinfrastructure] -> system + }, + "framework-connectivity-t.impl": { "app-compat-annotations", // apex [com.android.tethering] -> system "framework-connectivity-pre-jarjar", // apex [com.android.tethering] -> system @@ -832,6 +853,7 @@ var ContainerDependencyViolationAllowlist = map[string][]string{ }, "framework-ondevicepersonalization.impl": { + "app-compat-annotations", // apex [com.android.ondevicepersonalization] -> system "ondevicepersonalization_flags_lib", // apex [com.android.ondevicepersonalization] -> system },