tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "typos fixed" am: 92a21ddb41 am: 16e222bc2a am: ad13d5bdf1 am: 50982cb46e

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

Change-Id: I214ff317dbd80e35ad85ebaaf18f67008abac563
This commit is contained in:
Treehugger Robot 2022-02-22 15:28:10 +00:00 committed by Automerger Merge Worker
commit 845e911391
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/arch.go
View file

@ -829,7 +829,7 @@ func createArchPropTypeDesc(props reflect.Type) []archPropTypeDesc {
const maxArchTypeNameSize = 500 const maxArchTypeNameSize = 500
// Convert the type to a new set of types that contains only the arch-specific properties // 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. // to keep the runtime-generated names under the limit.
propShards, _ := proptools.FilterPropertyStructSharded(props, maxArchTypeNameSize, filterArchStruct) propShards, _ := proptools.FilterPropertyStructSharded(props, maxArchTypeNameSize, filterArchStruct)

4
android/bazel_handler.go
View file

@ -73,7 +73,7 @@ type BazelHandler interface {
} }
type BazelContext 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 // by bazel. If any of these methods return (_, false), then the request
// has been queued to be run later. // has been queued to be run later.
@ -561,7 +561,7 @@ def %s(target):
return id_string + ">>" + %s(target) return id_string + ">>" + %s(target)
` `
for requestType, _ := range requestTypeToCqueryIdEntries { for requestType := range requestTypeToCqueryIdEntries {
labelMapName := requestType.Name() + "_Labels" labelMapName := requestType.Name() + "_Labels"
functionName := requestType.Name() + "_Fn" functionName := requestType.Name() + "_Fn"
labelRegistrationMapSection += fmt.Sprintf(mapDeclarationFormatString, labelRegistrationMapSection += fmt.Sprintf(mapDeclarationFormatString,