Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08bef285 authored by Xin Li's avatar Xin Li Committed by Gerrit Code Review
Browse files

Merge "Merge Android 14 QPR2 to AOSP main" into main

parents a7ee3e04 7e46832a

android/config.go

+3 −0
Original line number Diff line number Diff line
@@ -638,9 +638,12 @@ func NewConfig(cmdArgs CmdArgs, availableEnv map[string]string) (Config, error) 
		"framework-adservices":              {},

		"framework-appsearch":               {},

		"framework-bluetooth":               {},

		"framework-configinfrastructure":    {},

		"framework-connectivity":            {},

		"framework-connectivity-t":          {},

		"framework-devicelock":              {},

		"framework-graphics":                {},

		"framework-healthfitness":           {},

		"framework-location":                {},

		"framework-media":                   {},

		"framework-mediaprovider":           {},

android/updatable_modules.go

+1 −1
Original line number Diff line number Diff line
@@ -33,4 +33,4 @@ package android 
// * AOSP            - xx9990000

// * x-mainline-prod - xx9990000

// * master          - 990090000

const DefaultUpdatableModuleVersion = "340090000"
 
const DefaultUpdatableModuleVersion = "990090000"

java/aapt2.go

+2 −1
Original line number Diff line number Diff line
@@ -309,7 +309,8 @@ func aapt2ExtractExtraPackages(ctx android.ModuleContext, out android.WritablePa 


var aapt2ConvertRule = pctx.AndroidStaticRule("aapt2Convert",

	blueprint.RuleParams{

		Command:     `${config.Aapt2Cmd} convert --output-format $format $in -o $out`,

		Command: `${config.Aapt2Cmd} convert --enable-compact-entries ` +

			`--output-format $format $in -o $out`,

		CommandDeps: []string{"${config.Aapt2Cmd}"},

	}, "format",

)

java/aar.go

+2 −0
Original line number Diff line number Diff line
@@ -204,6 +204,8 @@ func (a *aapt) aapt2Flags(ctx android.ModuleContext, sdkContext android.SdkConte 
	// Flags specified in Android.bp

	linkFlags = append(linkFlags, a.aaptProperties.Aaptflags...)



	linkFlags = append(linkFlags, "--enable-compact-entries")



	// Find implicit or explicit asset and resource dirs

	assets := android.PathsRelativeToModuleSourceDir(android.SourceInput{

		Context:     ctx,

java/config/droidstubs.go

+0 −4
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ var ( 
		"--format=v2",

		"--repeat-errors-max 10",

		"--hide UnresolvedImport",

		"--hide InvalidNullabilityOverride",



		// Force metalava to ignore classes on the classpath when an API file contains missing classes.

		// See b/285140653 for more information.
@@ -49,9 +48,6 @@ var ( 
		// TODO(tnorbye): find owners to fix these warnings when annotation was enabled.

		"--hide HiddenTypedefConstant",

		"--hide SuperfluousPrefix",

		"--hide AnnotationExtraction",

		// b/222738070

		"--hide BannedThrow",

	}



	MetalavaAnnotationsWarningsFlags = strings.Join(metalavaAnnotationsWarningsFlags, " ")