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

Commit ad13d5bd authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "typos fixed" am: 92a21ddb am: 16e222bc 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1991433

Change-Id: I981553820b5ef73d0d5320f444b9bbe74cf29ef6
parents 8a05c8df 16e222bc

android/arch.go

+1 −1
Original line number Diff line number Diff line
@@ -829,7 +829,7 @@ func createArchPropTypeDesc(props reflect.Type) []archPropTypeDesc { 
	const maxArchTypeNameSize = 500



	// Convert the type to a new set of types that contains only the arch-specific properties

	// (those that are tagged with `android:"arch_specific"`), and sharded into multiple types

	// (those that are tagged with `android:"arch_variant"`), and sharded into multiple types

	// to keep the runtime-generated names under the limit.

	propShards, _ := proptools.FilterPropertyStructSharded(props, maxArchTypeNameSize, filterArchStruct)

android/bazel_handler.go

+2 −2
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ type BazelHandler interface { 
}



type BazelContext interface {

	// The below methods involve queuing cquery requests to be later invoked

	// The methods below involve queuing cquery requests to be later invoked

	// by bazel. If any of these methods return (_, false), then the request

	// has been queued to be run later.
@@ -561,7 +561,7 @@ def %s(target): 
    return id_string + ">>" + %s(target)

`



	for requestType, _ := range requestTypeToCqueryIdEntries {

	for requestType := range requestTypeToCqueryIdEntries {

		labelMapName := requestType.Name() + "_Labels"

		functionName := requestType.Name() + "_Fn"

		labelRegistrationMapSection += fmt.Sprintf(mapDeclarationFormatString,