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

Commit 8ea2780a authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11520864 from ccb12a2e to 24Q2-release 

Change-Id: I035afb58aa6f37181e38528bde2c67571d0d277a
parents 7f7821db ccb12a2e

android/config.go

+10 −8
Original line number Diff line number Diff line
@@ -91,8 +91,6 @@ type CmdArgs struct { 
	ModuleActionsFile string

	DocFile           string



	MultitreeBuild bool



	BuildFromSourceStub bool



	EnsureAllowlistIntegrity bool
@@ -288,10 +286,6 @@ type config struct { 


	BuildMode SoongBuildMode



	// If MultitreeBuild is true then this is one inner tree of a multitree

	// build directed by the multitree orchestrator.

	MultitreeBuild bool



	// If testAllowNonExistentPaths is true then PathForSource and PathForModuleSrc won't error

	// in tests when a path doesn't exist.

	TestAllowNonExistentPaths bool
@@ -541,8 +535,6 @@ func NewConfig(cmdArgs CmdArgs, availableEnv map[string]string) (Config, error) 
		moduleListFile: cmdArgs.ModuleListFile,

		fs:             pathtools.NewOsFs(absSrcDir),



		MultitreeBuild: cmdArgs.MultitreeBuild,



		buildFromSourceStub: cmdArgs.BuildFromSourceStub,

	}
@@ -2030,25 +2022,35 @@ func (c *config) UseResourceProcessorByDefault() bool { 


var (

	mainlineApexContributionBuildFlags = []string{

		"RELEASE_APEX_CONTRIBUTIONS_ADBD",

		"RELEASE_APEX_CONTRIBUTIONS_ADSERVICES",

		"RELEASE_APEX_CONTRIBUTIONS_APPSEARCH",

		"RELEASE_APEX_CONTRIBUTIONS_ART",

		"RELEASE_APEX_CONTRIBUTIONS_BLUETOOTH",

		"RELEASE_APEX_CONTRIBUTIONS_CAPTIVEPORTALLOGIN",

		"RELEASE_APEX_CONTRIBUTIONS_CELLBROADCAST",

		"RELEASE_APEX_CONTRIBUTIONS_CONFIGINFRASTRUCTURE",

		"RELEASE_APEX_CONTRIBUTIONS_CONNECTIVITY",

		"RELEASE_APEX_CONTRIBUTIONS_CONSCRYPT",

		"RELEASE_APEX_CONTRIBUTIONS_CRASHRECOVERY",

		"RELEASE_APEX_CONTRIBUTIONS_DEVICELOCK",

		"RELEASE_APEX_CONTRIBUTIONS_DOCUMENTSUIGOOGLE",

		"RELEASE_APEX_CONTRIBUTIONS_EXTSERVICES",

		"RELEASE_APEX_CONTRIBUTIONS_HEALTHFITNESS",

		"RELEASE_APEX_CONTRIBUTIONS_IPSEC",

		"RELEASE_APEX_CONTRIBUTIONS_MEDIA",

		"RELEASE_APEX_CONTRIBUTIONS_MEDIAPROVIDER",

		"RELEASE_APEX_CONTRIBUTIONS_NETWORKSTACKGOOGLE",

		"RELEASE_APEX_CONTRIBUTIONS_NEURALNETWORKS",

		"RELEASE_APEX_CONTRIBUTIONS_ONDEVICEPERSONALIZATION",

		"RELEASE_APEX_CONTRIBUTIONS_PERMISSION",

		"RELEASE_APEX_CONTRIBUTIONS_REMOTEKEYPROVISIONING",

		"RELEASE_APEX_CONTRIBUTIONS_RESOLV",

		"RELEASE_APEX_CONTRIBUTIONS_SCHEDULING",

		"RELEASE_APEX_CONTRIBUTIONS_SDKEXTENSIONS",

		"RELEASE_APEX_CONTRIBUTIONS_SWCODEC",

		"RELEASE_APEX_CONTRIBUTIONS_STATSD",

		"RELEASE_APEX_CONTRIBUTIONS_TZDATA",

		"RELEASE_APEX_CONTRIBUTIONS_UWB",

		"RELEASE_APEX_CONTRIBUTIONS_WIFI",

	}

cc/prebuilt.go

+3 −0
Original line number Diff line number Diff line
@@ -260,6 +260,9 @@ func (p *prebuiltLibraryLinker) nativeCoverage() bool { 


func (p *prebuiltLibraryLinker) disablePrebuilt() {

	p.properties.Srcs = nil

	p.properties.Sanitized.None.Srcs = nil

	p.properties.Sanitized.Address.Srcs = nil

	p.properties.Sanitized.Hwaddress.Srcs = nil

}



// Implements versionedInterface

cc/stl.go

+7 −5
Original line number Diff line number Diff line
@@ -205,12 +205,14 @@ func (stl *stl) flags(ctx ModuleContext, flags Flags) Flags { 
			flags.extraLibFlags = append(flags.extraLibFlags, "-nostdlib++")

			if ctx.Windows() {

				flags.Local.CppFlags = append(flags.Local.CppFlags,

					// Disable visiblity annotations since we're using static

					// libc++.

					"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",

					"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",

					// These macros can also be defined by libc++'s __config

					// or __config_site headers so define them the same way

					// (i.e. to nothing). Disable visibility annotations since

					// we're using static libc++.

					"-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS=",

					"-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS=",

					// Use Win32 threads in libc++.

					"-D_LIBCPP_HAS_THREAD_API_WIN32")

					"-D_LIBCPP_HAS_THREAD_API_WIN32=")

			}

		}

	case "libstdc++":

cmd/soong_build/main.go

+0 −1
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ func init() { 
	flag.StringVar(&cmdlineArgs.OutFile, "o", "build.ninja", "the Ninja file to output")

	flag.StringVar(&cmdlineArgs.SoongVariables, "soong_variables", "soong.variables", "the file contains all build variables")

	flag.BoolVar(&cmdlineArgs.EmptyNinjaFile, "empty-ninja-file", false, "write out a 0-byte ninja file")

	flag.BoolVar(&cmdlineArgs.MultitreeBuild, "multitree-build", false, "this is a multitree build")

	flag.BoolVar(&cmdlineArgs.BuildFromSourceStub, "build-from-source-stub", false, "build Java stubs from source files instead of API text files")

	flag.BoolVar(&cmdlineArgs.EnsureAllowlistIntegrity, "ensure-allowlist-integrity", false, "verify that allowlisted modules are mixed-built")

	flag.StringVar(&cmdlineArgs.ModuleDebugFile, "soong_module_debug", "", "soong module debug info file to write")

rust/config/lints.go

+2 −0
Original line number Diff line number Diff line
@@ -53,6 +53,8 @@ var ( 
	// It should be assumed that any warning lint will be promoted to a

	// deny.

	defaultClippyLints = []string{

		// Let people hack in peace. ;)

		"-A clippy::disallowed_names",

		"-A clippy::type-complexity",

		"-A clippy::unnecessary_fallible_conversions",

		"-A clippy::unnecessary-wraps",