openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
Colin Cross 2019-04-02 16:14:11 -07:00
parent 134f8f6f00
commit cc0ce80ed5
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/defs.go
View File

@ -20,7 +20,7 @@ import (
) )
var ( var (
pctx = NewPackageContext("android/soong/common") pctx = NewPackageContext("android/soong/android")
cpPreserveSymlinks = pctx.VariableConfigMethod("cpPreserveSymlinks", cpPreserveSymlinks = pctx.VariableConfigMethod("cpPreserveSymlinks",
Config.CpPreserveSymlinksFlags) Config.CpPreserveSymlinksFlags)

2
apex/apex.go
View File

@ -119,7 +119,7 @@ var (
) )
func init() { func init() {
pctx.Import("android/soong/common") pctx.Import("android/soong/android")
pctx.Import("android/soong/java") pctx.Import("android/soong/java")
pctx.HostBinToolVariable("apexer", "apexer") pctx.HostBinToolVariable("apexer", "apexer")
// ART minimal builds (using the master-art manifest) do not have the "frameworks/base" // ART minimal builds (using the master-art manifest) do not have the "frameworks/base"

2
cc/ndk_sysroot.go
View File

@ -63,7 +63,7 @@ func init() {
android.RegisterModuleType("preprocessed_ndk_headers", preprocessedNdkHeadersFactory) android.RegisterModuleType("preprocessed_ndk_headers", preprocessedNdkHeadersFactory)
android.RegisterSingletonType("ndk", NdkSingleton) android.RegisterSingletonType("ndk", NdkSingleton)
pctx.Import("android/soong/common") pctx.Import("android/soong/android")
} }
func getNdkInstallBase(ctx android.PathContext) android.OutputPath { func getNdkInstallBase(ctx android.PathContext) android.OutputPath {

2
cmd/soong_env/soong_env.go
View File

@ -15,7 +15,7 @@
// soong_glob is the command line tool that checks if the list of files matching a glob has // 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 // 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 // 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 package main
import ( import (

2
java/builder.go
View File

@ -133,7 +133,7 @@ var (
) )
func init() { func init() {
pctx.Import("android/soong/common") pctx.Import("android/soong/android")
pctx.Import("android/soong/java/config") pctx.Import("android/soong/java/config")
} }

2
python/builder.go
View File

@ -73,7 +73,7 @@ var (
func init() { func init() {
pctx.Import("github.com/google/blueprint/bootstrap") pctx.Import("github.com/google/blueprint/bootstrap")
pctx.Import("android/soong/common") pctx.Import("android/soong/android")
pctx.HostBinToolVariable("parCmd", "soong_zip") pctx.HostBinToolVariable("parCmd", "soong_zip")
pctx.HostBinToolVariable("mergeParCmd", "merge_zips") pctx.HostBinToolVariable("mergeParCmd", "merge_zips")