From c725f47f5d8d0ebb3965b334b5d965290dc72941 Mon Sep 17 00:00:00 2001
From: Usta Shrestha <usta@google.com>
Date: Tue, 11 Jan 2022 02:44:21 -0500
Subject: [PATCH] cosmetic: 1)typos 2)parameters named for clarity

Test: n/a
Bug: n/a
Change-Id: I49faa1d8dec4b729409a45e87212b271ecf9e9d1
---
 README.md            | 2 +-
 android/mutator.go   | 4 ++--
 android/namespace.go | 2 +-
 android/register.go  | 2 +-
 android/variable.go  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 127c52cbd..18c660445 100644
--- a/README.md
+++ b/README.md
@@ -188,7 +188,7 @@ a functionally equivalent module. Enter Soong namespaces.
 
 #### Namespaces
 
-A presense of the `soong_namespace {..}` in an Android.bp file defines a
+The presence of the `soong_namespace {..}` in an Android.bp file defines a
 **namespace**. For instance, having
 
 ```
diff --git a/android/mutator.go b/android/mutator.go
index fa6f2be8d..739e4ee6d 100644
--- a/android/mutator.go
+++ b/android/mutator.go
@@ -323,13 +323,13 @@ type BottomUpMutatorContext interface {
 	// AddVariationDependencies adds deps as dependencies of the current module, but uses the variations
 	// argument to select which variant of the dependency to use.  It returns a slice of modules for
 	// each dependency (some entries may be nil).  A variant of the dependency must exist that matches
-	// the all of the non-local variations of the current module, plus the variations argument.
+	// all the non-local variations of the current module, plus the variations argument.
 	//
 	// If the mutator is parallel (see MutatorHandle.Parallel), this method will pause until the
 	// new dependencies have had the current mutator called on them.  If the mutator is not
 	// parallel this method does not affect the ordering of the current mutator pass, but will
 	// be ordered correctly for all future mutator passes.
-	AddVariationDependencies([]blueprint.Variation, blueprint.DependencyTag, ...string) []blueprint.Module
+	AddVariationDependencies(variations []blueprint.Variation, tag blueprint.DependencyTag, names ...string) []blueprint.Module
 
 	// AddFarVariationDependencies adds deps as dependencies of the current module, but uses the
 	// variations argument to select which variant of the dependency to use.  It returns a slice of
diff --git a/android/namespace.go b/android/namespace.go
index 4f727e14e..fc7bc290f 100644
--- a/android/namespace.go
+++ b/android/namespace.go
@@ -74,7 +74,7 @@ func (s *sortedNamespaces) index(namespace *Namespace) int {
 
 // A NameResolver implements blueprint.NameInterface, and implements the logic to
 // find a module from namespaces based on a query string.
-// A query string can be a module name or can be be "//namespace_path:module_path"
+// A query string can be a module name or can be "//namespace_path:module_path"
 type NameResolver struct {
 	rootNamespace *Namespace
 
diff --git a/android/register.go b/android/register.go
index 1ac44402d..10e14e04d 100644
--- a/android/register.go
+++ b/android/register.go
@@ -31,7 +31,7 @@ import (
 type sortableComponent interface {
 	// componentName returns the name of the component.
 	//
-	// Uniquely identifies the components within the set of components used at runtimr and during
+	// Uniquely identifies the components within the set of components used at runtime and during
 	// tests.
 	componentName() string
 
diff --git a/android/variable.go b/android/variable.go
index 40dd2d82c..ff77fefe6 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -129,7 +129,7 @@ type variableProperties struct {
 			Exclude_srcs []string
 		}
 
-		// eng is true for -eng builds, and can be used to turn on additionaly heavyweight debugging
+		// eng is true for -eng builds, and can be used to turn on additional heavyweight debugging
 		// features.
 		Eng struct {
 			Cflags   []string