Rename common to android
Rename the "common" package to "android", because common is too
generic. Also removes all android.Android naming stutter.
Ran:
gomvpkg -from 'android/soong/common' -to 'android/soong/android'
gorename -from '"android/soong/android".AndroidModuleContext' -to 'ModuleContext'
gorename -from '"android/soong/android".AndroidBaseContext' -to 'BaseContext'
gorename -from '"android/soong/android".AndroidModuleBase' -to 'ModuleBase'
gorename -from '"android/soong/android".AndroidBottomUpMutatorContext' -to 'BottomUpMutatorContext'
gorename -from '"android/soong/android".AndroidTopDownMutatorContext' -to 'TopDownMutatorContext'
gorename -from '"android/soong/android".AndroidModule' -to 'Module'
Change-Id: I3b23590b8ce7c8a1ea1139411d84a53163288da7
diff --git a/Android.bp b/Android.bp
index a9e41d9..805346f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -16,7 +16,7 @@
"blueprint",
"blueprint-bootstrap",
"soong",
- "soong-common",
+ "soong-android",
"soong-env",
],
srcs: [
@@ -79,8 +79,8 @@
}
bootstrap_go_package {
- name: "soong-common",
- pkgPath: "android/soong/common",
+ name: "soong-android",
+ pkgPath: "android/soong/android",
deps: [
"blueprint",
"blueprint-bootstrap",
@@ -89,25 +89,25 @@
"soong-glob",
],
srcs: [
- "common/androidmk.go",
- "common/arch.go",
- "common/config.go",
- "common/defaults.go",
- "common/defs.go",
- "common/glob.go",
- "common/makevars.go",
- "common/module.go",
- "common/mutator.go",
- "common/package_ctx.go",
- "common/paths.go",
- "common/util.go",
- "common/variable.go",
+ "android/androidmk.go",
+ "android/arch.go",
+ "android/config.go",
+ "android/defaults.go",
+ "android/defs.go",
+ "android/glob.go",
+ "android/makevars.go",
+ "android/module.go",
+ "android/mutator.go",
+ "android/package_ctx.go",
+ "android/paths.go",
+ "android/util.go",
+ "android/variable.go",
// Lock down environment access last
- "common/env.go",
+ "android/env.go",
],
testSrcs: [
- "common/paths_test.go",
+ "android/paths_test.go",
],
}
@@ -118,7 +118,7 @@
"blueprint",
"blueprint-pathtools",
"soong",
- "soong-common",
+ "soong-android",
"soong-genrule",
],
srcs: [
@@ -157,7 +157,7 @@
"blueprint",
"blueprint-pathtools",
"soong",
- "soong-common",
+ "soong-android",
],
srcs: [
"genrule/genrule.go",
@@ -179,7 +179,7 @@
"blueprint",
"blueprint-pathtools",
"soong",
- "soong-common",
+ "soong-android",
"soong-genrule",
],
srcs: [