Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 713ef2b4 authored by Colin Cross's avatar Colin Cross Committed by Simran Basi
Browse files

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").

Bug: 130298888
Test: m checkbuild
Change-Id: I20d096522760538f7cfc2bec3d4bfeba99b275d4
parent 47946569

android/defs.go

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import ( 
)



var (

	pctx = NewPackageContext("android/soong/common")

	pctx = NewPackageContext("android/soong/android")



	cpPreserveSymlinks = pctx.VariableConfigMethod("cpPreserveSymlinks",

		Config.CpPreserveSymlinksFlags)

apex/apex.go

+1 −1
Original line number Diff line number Diff line
@@ -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"

cc/ndk_sysroot.go

+1 −1
Original line number Diff line number Diff line
@@ -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 {

cmd/soong_env/soong_env.go

+1 −1
Original line number Diff line number Diff line
@@ -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 (

java/builder.go

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ var ( 
)



func init() {

	pctx.Import("android/soong/common")

	pctx.Import("android/soong/android")

	pctx.Import("android/soong/java/config")

}