Fix package path of android/soong/android pctx
android/soong/common was renamed to android/soong/android long ago, but the pctx package path was still "android/soong/common". This required all users of rules defined in android/soong/android to import "android/soong/android" and then pctx.Import("android/soong/common"). Test: m checkbuild Change-Id: I20d096522760538f7cfc2bec3d4bfeba99b275d4
This commit is contained in:
parent
134f8f6f00
commit
cc0ce80ed5
|
@ -20,7 +20,7 @@ import (
|
|||
)
|
||||
|
||||
var (
|
||||
pctx = NewPackageContext("android/soong/common")
|
||||
pctx = NewPackageContext("android/soong/android")
|
||||
|
||||
cpPreserveSymlinks = pctx.VariableConfigMethod("cpPreserveSymlinks",
|
||||
Config.CpPreserveSymlinksFlags)
|
||||
|
|
|
@ -119,7 +119,7 @@ var (
|
|||
)
|
||||
|
||||
func init() {
|
||||
pctx.Import("android/soong/common")
|
||||
pctx.Import("android/soong/android")
|
||||
pctx.Import("android/soong/java")
|
||||
pctx.HostBinToolVariable("apexer", "apexer")
|
||||
// ART minimal builds (using the master-art manifest) do not have the "frameworks/base"
|
||||
|
|
|
@ -63,7 +63,7 @@ func init() {
|
|||
android.RegisterModuleType("preprocessed_ndk_headers", preprocessedNdkHeadersFactory)
|
||||
android.RegisterSingletonType("ndk", NdkSingleton)
|
||||
|
||||
pctx.Import("android/soong/common")
|
||||
pctx.Import("android/soong/android")
|
||||
}
|
||||
|
||||
func getNdkInstallBase(ctx android.PathContext) android.OutputPath {
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
// soong_glob is the command line tool that checks if the list of files matching a glob has
|
||||
// changed, and only updates the output file list if it has changed. It is used to optimize
|
||||
// out build.ninja regenerations when non-matching files are added. See
|
||||
// android/soong/common/glob.go for a longer description.
|
||||
// android/soong/android/glob.go for a longer description.
|
||||
package main
|
||||
|
||||
import (
|
||||
|
|
|
@ -133,7 +133,7 @@ var (
|
|||
)
|
||||
|
||||
func init() {
|
||||
pctx.Import("android/soong/common")
|
||||
pctx.Import("android/soong/android")
|
||||
pctx.Import("android/soong/java/config")
|
||||
}
|
||||
|
||||
|
|
|
@ -73,7 +73,7 @@ var (
|
|||
|
||||
func init() {
|
||||
pctx.Import("github.com/google/blueprint/bootstrap")
|
||||
pctx.Import("android/soong/common")
|
||||
pctx.Import("android/soong/android")
|
||||
|
||||
pctx.HostBinToolVariable("parCmd", "soong_zip")
|
||||
pctx.HostBinToolVariable("mergeParCmd", "merge_zips")
|
||||
|
|
Loading…
Reference in New Issue