diff --git a/aconfig/codegen/cc_aconfig_library.go b/aconfig/codegen/cc_aconfig_library.go index ec0a6b6cd..b5cf68798 100644 --- a/aconfig/codegen/cc_aconfig_library.go +++ b/aconfig/codegen/cc_aconfig_library.go @@ -156,7 +156,7 @@ func (this *CcAconfigLibraryCallbacks) GeneratorBuildActions(ctx cc.ModuleContex Args: map[string]string{ "gendir": this.generatedDir.String(), "mode": mode, - "debug": strconv.FormatBool(ctx.Config().ReleaseReadFromNewStorageCc()), + "debug": strconv.FormatBool(ctx.Config().ReleaseReadFromNewStorage()), }, }) diff --git a/aconfig/codegen/init.go b/aconfig/codegen/init.go index 6182e14d4..98d288f0a 100644 --- a/aconfig/codegen/init.go +++ b/aconfig/codegen/init.go @@ -64,11 +64,12 @@ var ( ` && ${aconfig} create-rust-lib` + ` --mode ${mode}` + ` --cache ${in}` + + ` --allow-instrumentation ${debug}` + ` --out ${gendir}`, CommandDeps: []string{ "$aconfig", }, - }, "gendir", "mode") + }, "gendir", "mode", "debug") ) func init() { diff --git a/aconfig/codegen/rust_aconfig_library.go b/aconfig/codegen/rust_aconfig_library.go index ad8d632a9..4b896c32d 100644 --- a/aconfig/codegen/rust_aconfig_library.go +++ b/aconfig/codegen/rust_aconfig_library.go @@ -2,6 +2,7 @@ package codegen import ( "fmt" + "strconv" "android/soong/android" "android/soong/rust" @@ -82,6 +83,7 @@ func (a *aconfigDecorator) GenerateSource(ctx rust.ModuleContext, deps rust.Path Args: map[string]string{ "gendir": generatedDir.String(), "mode": mode, + "debug": strconv.FormatBool(ctx.Config().ReleaseReadFromNewStorage()), }, }) a.BaseSourceProvider.OutputFiles = android.Paths{generatedSource} 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 8f6d7401b..bc53a3733 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" diff --git a/java/base.go b/java/base.go index 6cc006662..ef299b279 100644 --- a/java/base.go +++ b/java/base.go @@ -99,9 +99,6 @@ type CommonProperties struct { // if not blank, used as prefix to generate repackage rule Jarjar_prefix *string - // if set to true, skip the jarjar repackaging - Skip_jarjar_repackage *bool - // If not blank, set the java version passed to javac as -source and -target Java_version *string @@ -1159,13 +1156,11 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars, extraClasspath jarjarProviderData := j.collectJarJarRules(ctx) if jarjarProviderData != nil { android.SetProvider(ctx, JarJarProvider, *jarjarProviderData) - if !proptools.Bool(j.properties.Skip_jarjar_repackage) { - text := getJarJarRuleText(jarjarProviderData) - if text != "" { - ruleTextFile := android.PathForModuleOut(ctx, "repackaged-jarjar", "repackaging.txt") - android.WriteFileRule(ctx, ruleTextFile, text) - j.repackageJarjarRules = ruleTextFile - } + text := getJarJarRuleText(jarjarProviderData) + if text != "" { + ruleTextFile := android.PathForModuleOut(ctx, "repackaged-jarjar", "repackaging.txt") + android.WriteFileRule(ctx, ruleTextFile, text) + j.repackageJarjarRules = ruleTextFile } } diff --git a/java/config/config.go b/java/config/config.go index a50c1b42d..c28e07032 100644 --- a/java/config/config.go +++ b/java/config/config.go @@ -52,6 +52,7 @@ var ( "core-icu4j", "core-oj", "core-libart", + "wear-sdk.impl", } ) diff --git a/scripts/check_boot_jars/package_allowed_list.txt b/scripts/check_boot_jars/package_allowed_list.txt index bb88ccebf..1d2fc643f 100644 --- a/scripts/check_boot_jars/package_allowed_list.txt +++ b/scripts/check_boot_jars/package_allowed_list.txt @@ -3,7 +3,52 @@ ################################################### # core-libart.jar & core-oj.jar -java(\..*)? +java\.awt\.font +java\.beans +java\.io +java\.lang +java\.lang\.annotation +java\.lang\.constant +java\.lang\.invoke +java\.lang\.ref +java\.lang\.reflect +java\.lang\.runtime +java\.math +java\.net +java\.nio +java\.nio\.file +java\.nio\.file\.spi +java\.nio\.file\.attribute +java\.nio\.channels +java\.nio\.channels\.spi +java\.nio\.charset +java\.nio\.charset\.spi +java\.security +java\.security\.acl +java\.security\.cert +java\.security\.interfaces +java\.security\.spec +java\.sql +java\.text +java\.text\.spi +java\.time +java\.time\.chrono +java\.time\.format +java\.time\.temporal +java\.time\.zone +java\.util +java\.util\.concurrent +java\.util\.concurrent\.atomic +java\.util\.concurrent\.locks +java\.util\.function +java\.util\.jar +java\.util\.logging +java\.util\.prefs +java\.util\.random +java\.util\.regex +java\.util\.spi +java\.util\.stream +java\.util\.zip # TODO: Remove javax.annotation.processing if possible, see http://b/132338110: javax\.annotation\.processing javax\.crypto @@ -27,7 +72,20 @@ javax\.xml\.transform\.sax javax\.xml\.transform\.stream javax\.xml\.validation javax\.xml\.xpath -jdk\..* +jdk\.internal +jdk\.internal\.access +jdk\.internal\.event +jdk\.internal\.math +jdk\.internal\.misc +jdk\.internal\.ref +jdk\.internal\.reflect +jdk\.internal\.util +jdk\.internal\.util\.jar +jdk\.internal\.util\.random +jdk\.internal\.vm +jdk\.internal\.vm\.annotation +jdk\.net +jdk\.random org\.w3c\.dom org\.w3c\.dom\.ls org\.w3c\.dom\.traversal