diff options
Diffstat (limited to 'android')
| -rw-r--r-- | android/api_levels.go | 41 | ||||
| -rw-r--r-- | android/config.go | 5 | ||||
| -rw-r--r-- | android/container_violations.go | 81 | ||||
| -rw-r--r-- | android/updatable_modules.go | 2 |
4 files changed, 108 insertions, 21 deletions
diff --git a/android/api_levels.go b/android/api_levels.go index dc17238f3..2b1d01d8b 100644 --- a/android/api_levels.go +++ b/android/api_levels.go @@ -444,26 +444,27 @@ func GetApiLevelsJson(ctx PathContext) WritablePath { func getApiLevelsMapReleasedVersions() (map[string]int, error) { return map[string]int{ - "G": 9, - "I": 14, - "J": 16, - "J-MR1": 17, - "J-MR2": 18, - "K": 19, - "L": 21, - "L-MR1": 22, - "M": 23, - "N": 24, - "N-MR1": 25, - "O": 26, - "O-MR1": 27, - "P": 28, - "Q": 29, - "R": 30, - "S": 31, - "S-V2": 32, - "Tiramisu": 33, - "UpsideDownCake": 34, + "G": 9, + "I": 14, + "J": 16, + "J-MR1": 17, + "J-MR2": 18, + "K": 19, + "L": 21, + "L-MR1": 22, + "M": 23, + "N": 24, + "N-MR1": 25, + "O": 26, + "O-MR1": 27, + "P": 28, + "Q": 29, + "R": 30, + "S": 31, + "S-V2": 32, + "Tiramisu": 33, + "UpsideDownCake": 34, + "VanillaIceCream": 35, }, nil } diff --git a/android/config.go b/android/config.go index cf3499f2c..8fb092662 100644 --- a/android/config.go +++ b/android/config.go @@ -270,6 +270,11 @@ func (c Config) ReleaseHiddenApiExportableStubs() bool { Bool(c.config.productVariables.HiddenapiExportableStubs) } +// Enable read flag from new storage +func (c Config) ReleaseReadFromNewStorage() bool { + return c.config.productVariables.GetBuildFlagBool("RELEASE_READ_FROM_NEW_STORAGE") +} + // A DeviceConfig object represents the configuration for a particular device // being built. For now there will only be one of these, but in the future there // may be multiple devices being built. diff --git a/android/container_violations.go b/android/container_violations.go index e67533dbe..42514849e 100644 --- a/android/container_violations.go +++ b/android/container_violations.go @@ -169,6 +169,10 @@ var ContainerDependencyViolationAllowlist = map[string][]string{ "framework", // cts -> unstable }, + "CtsAppStartTestCases": { + "framework", // cts -> unstable + }, + "CtsAppTestStubsApp2": { "framework", // cts -> unstable }, @@ -273,6 +277,10 @@ var ContainerDependencyViolationAllowlist = map[string][]string{ "framework", // cts -> unstable }, + "CtsDocumentContentTestCases": { + "framework", // cts -> unstable + }, + "CtsDreamsTestCases": { "framework", // cts -> unstable }, @@ -281,6 +289,10 @@ var ContainerDependencyViolationAllowlist = map[string][]string{ "framework", // cts -> unstable }, + "CtsEmptyTestApp_RejectedByVerifier": { + "framework", // cts -> unstable + }, + "CtsEphemeralTestsEphemeralApp1": { "framework", // cts -> unstable }, @@ -301,10 +313,18 @@ var ContainerDependencyViolationAllowlist = map[string][]string{ "framework", // cts -> unstable }, + "CtsFgsTimeoutTestCases": { + "framework", // cts -> unstable + }, + "CtsFileDescriptorTestCases": { "framework", // cts -> unstable }, + "CtsFingerprintTestCases": { + "framework", // cts -> unstable + }, + "CtsHostsideCompatChangeTestsApp": { "framework", // cts -> unstable }, @@ -433,6 +453,10 @@ var ContainerDependencyViolationAllowlist = map[string][]string{ "framework", // cts -> unstable }, + "CtsMediaProviderTestCases": { + "framework", // cts -> unstable + }, + "CtsMediaProviderTranscodeTests": { "framework", // cts -> unstable }, @@ -501,6 +525,10 @@ var ContainerDependencyViolationAllowlist = map[string][]string{ "framework", // cts -> unstable }, + "CtsOnDeviceIntelligenceServiceTestCases": { + "framework", // cts -> unstable + }, + "CtsOnDevicePersonalizationTestCases": { "framework", // cts -> unstable }, @@ -521,6 +549,10 @@ var ContainerDependencyViolationAllowlist = map[string][]string{ "framework", // cts -> unstable }, + "CtsPackageWatchdogTestCases": { + "framework", // cts -> unstable + }, + "CtsPermissionsSyncTestApp": { "framework", // cts -> unstable }, @@ -669,6 +701,10 @@ var ContainerDependencyViolationAllowlist = map[string][]string{ "framework", // cts -> unstable }, + "CtsTvTunerTestCases": { + "framework", // cts -> unstable + }, + "CtsUsageStatsTestCases": { "framework", // cts -> unstable }, @@ -799,6 +835,11 @@ var ContainerDependencyViolationAllowlist = map[string][]string{ "ondevicepersonalization_flags_lib", // apex [com.android.ondevicepersonalization] -> system }, + "framework-pdf-v.impl": { + "app-compat-annotations", // apex [com.android.mediaprovider, test_com.android.mediaprovider] -> system + "modules-utils-preconditions", // apex [com.android.mediaprovider, test_com.android.mediaprovider] -> 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] + }, + "framework-pdf.impl": { "modules-utils-preconditions", // apex [com.android.mediaprovider, test_com.android.mediaprovider] -> 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] }, @@ -837,14 +878,54 @@ var ContainerDependencyViolationAllowlist = map[string][]string{ "libnativeloader_vendor_shared_lib", // system -> vendor }, + "MctsMediaBetterTogetherTestCases": { + "framework", // cts -> unstable + }, + + "MctsMediaCodecTestCases": { + "framework", // cts -> unstable + }, + + "MctsMediaDecoderTestCases": { + "framework", // cts -> unstable + }, + "MctsMediaDrmFrameworkTestCases": { "framework", // cts -> unstable }, + "MctsMediaEncoderTestCases": { + "framework", // cts -> unstable + }, + + "MctsMediaExtractorTestCases": { + "framework", // cts -> unstable + }, + + "MctsMediaMiscTestCases": { + "framework", // cts -> unstable + }, + + "MctsMediaMuxerTestCases": { + "framework", // cts -> unstable + }, + + "MctsMediaPlayerTestCases": { + "framework", // cts -> unstable + }, + + "MctsMediaRecorderTestCases": { + "framework", // cts -> unstable + }, + "MctsMediaTranscodingTestCases": { "framework", // cts -> unstable }, + "MctsMediaV2TestCases": { + "framework", // cts -> unstable + }, + "MediaProvider": { "app-compat-annotations", // apex [com.android.mediaprovider, test_com.android.mediaprovider] -> system }, diff --git a/android/updatable_modules.go b/android/updatable_modules.go index dd7dc2c2f..d2595ed14 100644 --- a/android/updatable_modules.go +++ b/android/updatable_modules.go @@ -33,4 +33,4 @@ package android // * AOSP - xx9990000 // * x-mainline-prod - xx9990000 // * master - 990090000 -const DefaultUpdatableModuleVersion = "350090000" +const DefaultUpdatableModuleVersion = "352090000" |