diff options
| author | 2019-04-02 16:14:11 -0700 | |
|---|---|---|
| committer | 2019-04-04 03:59:34 +0000 | |
| commit | cc0ce80ed5afa64d36c2d5ae1dc3a2de70f0eacb (patch) | |
| tree | c23111f134dddd5db802003b49535019530440f8 | |
| parent | 134f8f6f00a99d59bfd6080579fcb0ea3ec0690d (diff) | |
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
| -rw-r--r-- | android/defs.go | 2 | ||||
| -rw-r--r-- | apex/apex.go | 2 | ||||
| -rw-r--r-- | cc/ndk_sysroot.go | 2 | ||||
| -rw-r--r-- | cmd/soong_env/soong_env.go | 2 | ||||
| -rw-r--r-- | java/builder.go | 2 | ||||
| -rw-r--r-- | python/builder.go | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/android/defs.go b/android/defs.go index cd8b4e318..4890c6618 100644 --- a/android/defs.go +++ b/android/defs.go @@ -20,7 +20,7 @@ import ( ) var ( - pctx = NewPackageContext("android/soong/common") + pctx = NewPackageContext("android/soong/android") cpPreserveSymlinks = pctx.VariableConfigMethod("cpPreserveSymlinks", Config.CpPreserveSymlinksFlags) diff --git a/apex/apex.go b/apex/apex.go index ce1ed46b4..3327a566e 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -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" diff --git a/cc/ndk_sysroot.go b/cc/ndk_sysroot.go index 9265bffaf..e39bae559 100644 --- a/cc/ndk_sysroot.go +++ b/cc/ndk_sysroot.go @@ -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 { diff --git a/cmd/soong_env/soong_env.go b/cmd/soong_env/soong_env.go index 933e525ae..d305d8388 100644 --- a/cmd/soong_env/soong_env.go +++ b/cmd/soong_env/soong_env.go @@ -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 ( diff --git a/java/builder.go b/java/builder.go index 44767a504..ce9a5ee87 100644 --- a/java/builder.go +++ b/java/builder.go @@ -133,7 +133,7 @@ var ( ) func init() { - pctx.Import("android/soong/common") + pctx.Import("android/soong/android") pctx.Import("android/soong/java/config") } diff --git a/python/builder.go b/python/builder.go index e3b490cff..36baecdf1 100644 --- a/python/builder.go +++ b/python/builder.go @@ -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") |