tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update import paths for changes to blueprint

Browse source 
Blueprint has been modified to include a canonical import path,
update soong to match.

Change-Id: If29d31afbf3bf2e6364961a66456fa5f8f738455
This commit is contained in:
Colin Cross 2015-03-23 12:57:34 -07:00
parent 7601ef600a
commit 70b4059e3f
14 changed files with 118 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
androidmk/cmd/androidmk/androidmk.go
View file

@ -10,7 +10,7 @@ import (
mkparser "android/soong/androidmk/parser"
bpparser "blueprint/parser"
bpparser "github.com/google/blueprint/parser"
)
// TODO: non-expanded variables with expressions

2
androidmk/cmd/androidmk/values.go
View file

@ -6,7 +6,7 @@ import (
mkparser "android/soong/androidmk/parser"
bpparser "blueprint/parser"
bpparser "github.com/google/blueprint/parser"
)
func stringToStringValue(s string) *bpparser.Value {

185
build.ninja.in
View file

@ -5,7 +5,7 @@
# This file contains variables, rules, and pools with name prefixes indicating
# they were generated by the following Go packages:
#
# bootstrap [from Go package blueprint/bootstrap]
# bootstrap [from Go package github.com/google/blueprint/bootstrap]
#
ninja_required_version = 1.1.0
@ -52,7 +52,7 @@ rule g.bootstrap.link
# Module: androidmk
# Variant:
# Type: bootstrap_go_binary
# Factory: blueprint/bootstrap.newGoBinaryModule
# Factory: github.com/google/blueprint/bootstrap.newGoBinaryModule
# Defined: build/soong/Blueprints:122:1
build .bootstrap/androidmk/obj/androidmk.a: g.bootstrap.gc $
@ -61,7 +61,7 @@ build .bootstrap/androidmk/obj/androidmk.a: g.bootstrap.gc $
${g.bootstrap.srcDir}/build/soong/androidmk/cmd/androidmk/values.go | $
${g.bootstrap.gcCmd} $
.bootstrap/androidmk-parser/pkg/android/soong/androidmk/parser.a $
.bootstrap/blueprint-parser/pkg/blueprint/parser.a
.bootstrap/blueprint-parser/pkg/github.com/google/blueprint/parser.a
incFlags = -I .bootstrap/androidmk-parser/pkg -I .bootstrap/blueprint-parser/pkg
pkgPath = androidmk
default .bootstrap/androidmk/obj/androidmk.a
@ -78,7 +78,7 @@ default .bootstrap/bin/androidmk
# Module: androidmk-parser
# Variant:
# Type: bootstrap_go_package
# Factory: blueprint/bootstrap.newGoPackageModule
# Factory: github.com/google/blueprint/bootstrap.newGoPackageModule
# Defined: build/soong/Blueprints:135:1
build .bootstrap/androidmk-parser/pkg/android/soong/androidmk/parser.a: $
@ -95,10 +95,10 @@ default .bootstrap/androidmk-parser/pkg/android/soong/androidmk/parser.a
# Module: blueprint
# Variant:
# Type: bootstrap_go_package
# Factory: blueprint/bootstrap.newGoPackageModule
# Factory: github.com/google/blueprint/bootstrap.newGoPackageModule
# Defined: build/blueprint/Blueprints:1:1
build .bootstrap/blueprint/pkg/blueprint.a: g.bootstrap.gc $
build .bootstrap/blueprint/pkg/github.com/google/blueprint.a: g.bootstrap.gc $
${g.bootstrap.srcDir}/build/blueprint/context.go $
${g.bootstrap.srcDir}/build/blueprint/live_tracker.go $
${g.bootstrap.srcDir}/build/blueprint/mangle.go $
@ -110,102 +110,113 @@ build .bootstrap/blueprint/pkg/blueprint.a: g.bootstrap.gc $
${g.bootstrap.srcDir}/build/blueprint/scope.go $
${g.bootstrap.srcDir}/build/blueprint/singleton_ctx.go $
${g.bootstrap.srcDir}/build/blueprint/unpack.go | ${g.bootstrap.gcCmd} $
.bootstrap/blueprint-parser/pkg/blueprint/parser.a $
.bootstrap/blueprint-proptools/pkg/blueprint/proptools.a
.bootstrap/blueprint-parser/pkg/github.com/google/blueprint/parser.a $
.bootstrap/blueprint-proptools/pkg/github.com/google/blueprint/proptools.a
incFlags = -I .bootstrap/blueprint-parser/pkg -I .bootstrap/blueprint-proptools/pkg
pkgPath = blueprint
default .bootstrap/blueprint/pkg/blueprint.a
pkgPath = github.com/google/blueprint
default .bootstrap/blueprint/pkg/github.com/google/blueprint.a
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# Module: blueprint-bootstrap
# Variant:
# Type: bootstrap_go_package
# Factory: blueprint/bootstrap.newGoPackageModule
# Factory: github.com/google/blueprint/bootstrap.newGoPackageModule
# Defined: build/blueprint/Blueprints:55:1
build .bootstrap/blueprint-bootstrap/pkg/blueprint/bootstrap.a: g.bootstrap.gc $
build $
.bootstrap/blueprint-bootstrap/pkg/github.com/google/blueprint/bootstrap.a $
: g.bootstrap.gc $
${g.bootstrap.srcDir}/build/blueprint/bootstrap/bootstrap.go $
${g.bootstrap.srcDir}/build/blueprint/bootstrap/cleanup.go $
${g.bootstrap.srcDir}/build/blueprint/bootstrap/command.go $
${g.bootstrap.srcDir}/build/blueprint/bootstrap/config.go $
${g.bootstrap.srcDir}/build/blueprint/bootstrap/doc.go | $
${g.bootstrap.gcCmd} $
.bootstrap/blueprint-parser/pkg/blueprint/parser.a $
.bootstrap/blueprint-proptools/pkg/blueprint/proptools.a $
.bootstrap/blueprint/pkg/blueprint.a $
.bootstrap/blueprint-deptools/pkg/blueprint/deptools.a $
.bootstrap/blueprint-pathtools/pkg/blueprint/pathtools.a
.bootstrap/blueprint-parser/pkg/github.com/google/blueprint/parser.a $
.bootstrap/blueprint-proptools/pkg/github.com/google/blueprint/proptools.a $
.bootstrap/blueprint/pkg/github.com/google/blueprint.a $
.bootstrap/blueprint-deptools/pkg/github.com/google/blueprint/deptools.a $
.bootstrap/blueprint-pathtools/pkg/github.com/google/blueprint/pathtools.a
incFlags = -I .bootstrap/blueprint-parser/pkg -I .bootstrap/blueprint-proptools/pkg -I .bootstrap/blueprint/pkg -I .bootstrap/blueprint-deptools/pkg -I .bootstrap/blueprint-pathtools/pkg
pkgPath = blueprint/bootstrap
default .bootstrap/blueprint-bootstrap/pkg/blueprint/bootstrap.a
pkgPath = github.com/google/blueprint/bootstrap
default $
.bootstrap/blueprint-bootstrap/pkg/github.com/google/blueprint/bootstrap.a
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# Module: blueprint-deptools
# Variant:
# Type: bootstrap_go_package
# Factory: blueprint/bootstrap.newGoPackageModule
# Factory: github.com/google/blueprint/bootstrap.newGoPackageModule
# Defined: build/blueprint/Blueprints:34:1
build .bootstrap/blueprint-deptools/pkg/blueprint/deptools.a: g.bootstrap.gc $
build .bootstrap/blueprint-deptools/pkg/github.com/google/blueprint/deptools.a $
: g.bootstrap.gc $
${g.bootstrap.srcDir}/build/blueprint/deptools/depfile.go | $
${g.bootstrap.gcCmd}
pkgPath = blueprint/deptools
default .bootstrap/blueprint-deptools/pkg/blueprint/deptools.a
pkgPath = github.com/google/blueprint/deptools
default $
.bootstrap/blueprint-deptools/pkg/github.com/google/blueprint/deptools.a
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# Module: blueprint-parser
# Variant:
# Type: bootstrap_go_package
# Factory: blueprint/bootstrap.newGoPackageModule
# Factory: github.com/google/blueprint/bootstrap.newGoPackageModule
# Defined: build/blueprint/Blueprints:23:1
build .bootstrap/blueprint-parser/pkg/blueprint/parser.a: g.bootstrap.gc $
${g.bootstrap.srcDir}/build/blueprint/parser/modify.go $
build .bootstrap/blueprint-parser/pkg/github.com/google/blueprint/parser.a: $
g.bootstrap.gc ${g.bootstrap.srcDir}/build/blueprint/parser/modify.go $
${g.bootstrap.srcDir}/build/blueprint/parser/parser.go $
${g.bootstrap.srcDir}/build/blueprint/parser/printer.go $
${g.bootstrap.srcDir}/build/blueprint/parser/sort.go | $
${g.bootstrap.gcCmd}
pkgPath = blueprint/parser
default .bootstrap/blueprint-parser/pkg/blueprint/parser.a
pkgPath = github.com/google/blueprint/parser
default .bootstrap/blueprint-parser/pkg/github.com/google/blueprint/parser.a
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# Module: blueprint-pathtools
# Variant:
# Type: bootstrap_go_package
# Factory: blueprint/bootstrap.newGoPackageModule
# Factory: github.com/google/blueprint/bootstrap.newGoPackageModule
# Defined: build/blueprint/Blueprints:40:1
build .bootstrap/blueprint-pathtools/pkg/blueprint/pathtools.a: g.bootstrap.gc $
build $
.bootstrap/blueprint-pathtools/pkg/github.com/google/blueprint/pathtools.a $
: g.bootstrap.gc $
${g.bootstrap.srcDir}/build/blueprint/pathtools/lists.go $
${g.bootstrap.srcDir}/build/blueprint/pathtools/glob.go | $
${g.bootstrap.gcCmd}
pkgPath = blueprint/pathtools
default .bootstrap/blueprint-pathtools/pkg/blueprint/pathtools.a
pkgPath = github.com/google/blueprint/pathtools
default $
.bootstrap/blueprint-pathtools/pkg/github.com/google/blueprint/pathtools.a
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# Module: blueprint-proptools
# Variant:
# Type: bootstrap_go_package
# Factory: blueprint/bootstrap.newGoPackageModule
# Factory: github.com/google/blueprint/bootstrap.newGoPackageModule
# Defined: build/blueprint/Blueprints:49:1
build .bootstrap/blueprint-proptools/pkg/blueprint/proptools.a: g.bootstrap.gc $
build $
.bootstrap/blueprint-proptools/pkg/github.com/google/blueprint/proptools.a $
: g.bootstrap.gc $
${g.bootstrap.srcDir}/build/blueprint/proptools/proptools.go | $
${g.bootstrap.gcCmd}
pkgPath = blueprint/proptools
default .bootstrap/blueprint-proptools/pkg/blueprint/proptools.a
pkgPath = github.com/google/blueprint/proptools
default $
.bootstrap/blueprint-proptools/pkg/github.com/google/blueprint/proptools.a
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# Module: bpfmt
# Variant:
# Type: bootstrap_go_binary
# Factory: blueprint/bootstrap.newGoBinaryModule
# Factory: github.com/google/blueprint/bootstrap.newGoBinaryModule
# Defined: build/blueprint/Blueprints:81:1
build .bootstrap/bpfmt/obj/bpfmt.a: g.bootstrap.gc $
${g.bootstrap.srcDir}/build/blueprint/bpfmt/bpfmt.go | $
${g.bootstrap.gcCmd} $
.bootstrap/blueprint-parser/pkg/blueprint/parser.a
.bootstrap/blueprint-parser/pkg/github.com/google/blueprint/parser.a
incFlags = -I .bootstrap/blueprint-parser/pkg
pkgPath = bpfmt
default .bootstrap/bpfmt/obj/bpfmt.a
@ -222,13 +233,13 @@ default .bootstrap/bin/bpfmt
# Module: bpmodify
# Variant:
# Type: bootstrap_go_binary
# Factory: blueprint/bootstrap.newGoBinaryModule
# Factory: github.com/google/blueprint/bootstrap.newGoBinaryModule
# Defined: build/blueprint/Blueprints:87:1
build .bootstrap/bpmodify/obj/bpmodify.a: g.bootstrap.gc $
${g.bootstrap.srcDir}/build/blueprint/bpmodify/bpmodify.go | $
${g.bootstrap.gcCmd} $
.bootstrap/blueprint-parser/pkg/blueprint/parser.a
.bootstrap/blueprint-parser/pkg/github.com/google/blueprint/parser.a
incFlags = -I .bootstrap/blueprint-parser/pkg
pkgPath = bpmodify
default .bootstrap/bpmodify/obj/bpmodify.a
@ -245,18 +256,18 @@ default .bootstrap/bin/bpmodify
# Module: minibp
# Variant:
# Type: bootstrap_go_binary
# Factory: blueprint/bootstrap.newGoBinaryModule
# Factory: github.com/google/blueprint/bootstrap.newGoBinaryModule
# Defined: build/blueprint/Blueprints:72:1
build .bootstrap/minibp/obj/minibp.a: g.bootstrap.gc $
${g.bootstrap.srcDir}/build/blueprint/bootstrap/minibp/main.go | $
${g.bootstrap.gcCmd} $
.bootstrap/blueprint-parser/pkg/blueprint/parser.a $
.bootstrap/blueprint-proptools/pkg/blueprint/proptools.a $
.bootstrap/blueprint/pkg/blueprint.a $
.bootstrap/blueprint-deptools/pkg/blueprint/deptools.a $
.bootstrap/blueprint-pathtools/pkg/blueprint/pathtools.a $
.bootstrap/blueprint-bootstrap/pkg/blueprint/bootstrap.a
.bootstrap/blueprint-parser/pkg/github.com/google/blueprint/parser.a $
.bootstrap/blueprint-proptools/pkg/github.com/google/blueprint/proptools.a $
.bootstrap/blueprint/pkg/github.com/google/blueprint.a $
.bootstrap/blueprint-deptools/pkg/github.com/google/blueprint/deptools.a $
.bootstrap/blueprint-pathtools/pkg/github.com/google/blueprint/pathtools.a $
.bootstrap/blueprint-bootstrap/pkg/github.com/google/blueprint/bootstrap.a
incFlags = -I .bootstrap/blueprint-parser/pkg -I .bootstrap/blueprint-proptools/pkg -I .bootstrap/blueprint/pkg -I .bootstrap/blueprint-deptools/pkg -I .bootstrap/blueprint-pathtools/pkg -I .bootstrap/blueprint-bootstrap/pkg
pkgPath = minibp
default .bootstrap/minibp/obj/minibp.a
@ -273,7 +284,7 @@ default .bootstrap/bin/minibp
# Module: soong-cc
# Variant:
# Type: bootstrap_go_package
# Factory: blueprint/bootstrap.newGoPackageModule
# Factory: github.com/google/blueprint/bootstrap.newGoPackageModule
# Defined: build/soong/Blueprints:81:1
build .bootstrap/soong-cc/pkg/android/soong/cc.a: g.bootstrap.gc $
@ -286,12 +297,12 @@ build .bootstrap/soong-cc/pkg/android/soong/cc.a: g.bootstrap.gc $
${g.bootstrap.srcDir}/build/soong/cc/arm64_device.go $
${g.bootstrap.srcDir}/build/soong/cc/x86_linux_host.go | $
${g.bootstrap.gcCmd} $
.bootstrap/blueprint-parser/pkg/blueprint/parser.a $
.bootstrap/blueprint-proptools/pkg/blueprint/proptools.a $
.bootstrap/blueprint/pkg/blueprint.a $
.bootstrap/blueprint-pathtools/pkg/blueprint/pathtools.a $
.bootstrap/blueprint-deptools/pkg/blueprint/deptools.a $
.bootstrap/blueprint-bootstrap/pkg/blueprint/bootstrap.a $
.bootstrap/blueprint-parser/pkg/github.com/google/blueprint/parser.a $
.bootstrap/blueprint-proptools/pkg/github.com/google/blueprint/proptools.a $
.bootstrap/blueprint/pkg/github.com/google/blueprint.a $
.bootstrap/blueprint-pathtools/pkg/github.com/google/blueprint/pathtools.a $
.bootstrap/blueprint-deptools/pkg/github.com/google/blueprint/deptools.a $
.bootstrap/blueprint-bootstrap/pkg/github.com/google/blueprint/bootstrap.a $
.bootstrap/soong-glob/pkg/android/soong/glob.a $
.bootstrap/soong-common/pkg/android/soong/common.a $
.bootstrap/soong-config/pkg/android/soong/config.a $
@ -304,7 +315,7 @@ default .bootstrap/soong-cc/pkg/android/soong/cc.a
# Module: soong-common
# Variant:
# Type: bootstrap_go_package
# Factory: blueprint/bootstrap.newGoPackageModule
# Factory: github.com/google/blueprint/bootstrap.newGoPackageModule
# Defined: build/soong/Blueprints:50:1
build .bootstrap/soong-common/pkg/android/soong/common.a: g.bootstrap.gc $
@ -315,12 +326,12 @@ build .bootstrap/soong-common/pkg/android/soong/common.a: g.bootstrap.gc $
${g.bootstrap.srcDir}/build/soong/common/module.go $
${g.bootstrap.srcDir}/build/soong/common/paths.go | $
${g.bootstrap.gcCmd} $
.bootstrap/blueprint-parser/pkg/blueprint/parser.a $
.bootstrap/blueprint-proptools/pkg/blueprint/proptools.a $
.bootstrap/blueprint/pkg/blueprint.a $
.bootstrap/blueprint-deptools/pkg/blueprint/deptools.a $
.bootstrap/blueprint-pathtools/pkg/blueprint/pathtools.a $
.bootstrap/blueprint-bootstrap/pkg/blueprint/bootstrap.a $
.bootstrap/blueprint-parser/pkg/github.com/google/blueprint/parser.a $
.bootstrap/blueprint-proptools/pkg/github.com/google/blueprint/proptools.a $
.bootstrap/blueprint/pkg/github.com/google/blueprint.a $
.bootstrap/blueprint-deptools/pkg/github.com/google/blueprint/deptools.a $
.bootstrap/blueprint-pathtools/pkg/github.com/google/blueprint/pathtools.a $
.bootstrap/blueprint-bootstrap/pkg/github.com/google/blueprint/bootstrap.a $
.bootstrap/soong-glob/pkg/android/soong/glob.a
incFlags = -I .bootstrap/blueprint-parser/pkg -I .bootstrap/blueprint-proptools/pkg -I .bootstrap/blueprint/pkg -I .bootstrap/blueprint-deptools/pkg -I .bootstrap/blueprint-pathtools/pkg -I .bootstrap/blueprint-bootstrap/pkg -I .bootstrap/soong-glob/pkg
pkgPath = android/soong/common
@ -330,18 +341,18 @@ default .bootstrap/soong-common/pkg/android/soong/common.a
# Module: soong-config
# Variant:
# Type: bootstrap_go_package
# Factory: blueprint/bootstrap.newGoPackageModule
# Factory: github.com/google/blueprint/bootstrap.newGoPackageModule
# Defined: build/soong/Blueprints:68:1
build .bootstrap/soong-config/pkg/android/soong/config.a: g.bootstrap.gc $
${g.bootstrap.srcDir}/build/soong/config/config.go | $
${g.bootstrap.gcCmd} $
.bootstrap/blueprint-parser/pkg/blueprint/parser.a $
.bootstrap/blueprint-proptools/pkg/blueprint/proptools.a $
.bootstrap/blueprint/pkg/blueprint.a $
.bootstrap/blueprint-deptools/pkg/blueprint/deptools.a $
.bootstrap/blueprint-pathtools/pkg/blueprint/pathtools.a $
.bootstrap/blueprint-bootstrap/pkg/blueprint/bootstrap.a $
.bootstrap/blueprint-parser/pkg/github.com/google/blueprint/parser.a $
.bootstrap/blueprint-proptools/pkg/github.com/google/blueprint/proptools.a $
.bootstrap/blueprint/pkg/github.com/google/blueprint.a $
.bootstrap/blueprint-deptools/pkg/github.com/google/blueprint/deptools.a $
.bootstrap/blueprint-pathtools/pkg/github.com/google/blueprint/pathtools.a $
.bootstrap/blueprint-bootstrap/pkg/github.com/google/blueprint/bootstrap.a $
.bootstrap/soong-glob/pkg/android/soong/glob.a $
.bootstrap/soong-common/pkg/android/soong/common.a
incFlags = -I .bootstrap/blueprint-parser/pkg -I .bootstrap/blueprint-proptools/pkg -I .bootstrap/blueprint/pkg -I .bootstrap/blueprint-deptools/pkg -I .bootstrap/blueprint-pathtools/pkg -I .bootstrap/blueprint-bootstrap/pkg -I .bootstrap/soong-glob/pkg -I .bootstrap/soong-common/pkg
@ -352,18 +363,18 @@ default .bootstrap/soong-config/pkg/android/soong/config.a
# Module: soong-genrule
# Variant:
# Type: bootstrap_go_package
# Factory: blueprint/bootstrap.newGoPackageModule
# Factory: github.com/google/blueprint/bootstrap.newGoPackageModule
# Defined: build/soong/Blueprints:105:1
build .bootstrap/soong-genrule/pkg/android/soong/genrule.a: g.bootstrap.gc $
${g.bootstrap.srcDir}/build/soong/genrule/genrule.go | $
${g.bootstrap.gcCmd} $
.bootstrap/blueprint-parser/pkg/blueprint/parser.a $
.bootstrap/blueprint-proptools/pkg/blueprint/proptools.a $
.bootstrap/blueprint/pkg/blueprint.a $
.bootstrap/blueprint-pathtools/pkg/blueprint/pathtools.a $
.bootstrap/blueprint-deptools/pkg/blueprint/deptools.a $
.bootstrap/blueprint-bootstrap/pkg/blueprint/bootstrap.a $
.bootstrap/blueprint-parser/pkg/github.com/google/blueprint/parser.a $
.bootstrap/blueprint-proptools/pkg/github.com/google/blueprint/proptools.a $
.bootstrap/blueprint/pkg/github.com/google/blueprint.a $
.bootstrap/blueprint-pathtools/pkg/github.com/google/blueprint/pathtools.a $
.bootstrap/blueprint-deptools/pkg/github.com/google/blueprint/deptools.a $
.bootstrap/blueprint-bootstrap/pkg/github.com/google/blueprint/bootstrap.a $
.bootstrap/soong-glob/pkg/android/soong/glob.a $
.bootstrap/soong-common/pkg/android/soong/common.a $
.bootstrap/soong-config/pkg/android/soong/config.a
@ -375,12 +386,12 @@ default .bootstrap/soong-genrule/pkg/android/soong/genrule.a
# Module: soong-glob
# Variant:
# Type: bootstrap_go_package
# Factory: blueprint/bootstrap.newGoPackageModule
# Factory: github.com/google/blueprint/bootstrap.newGoPackageModule
# Defined: build/soong/Blueprints:39:1
build .bootstrap/soong-glob/pkg/android/soong/glob.a: g.bootstrap.gc $
${g.bootstrap.srcDir}/build/soong/glob/glob.go | ${g.bootstrap.gcCmd} $
.bootstrap/blueprint-deptools/pkg/blueprint/deptools.a
.bootstrap/blueprint-deptools/pkg/github.com/google/blueprint/deptools.a
incFlags = -I .bootstrap/blueprint-deptools/pkg
pkgPath = android/soong/glob
default .bootstrap/soong-glob/pkg/android/soong/glob.a
@ -389,18 +400,18 @@ default .bootstrap/soong-glob/pkg/android/soong/glob.a
# Module: soong_build
# Variant:
# Type: bootstrap_go_binary
# Factory: blueprint/bootstrap.newGoBinaryModule
# Factory: github.com/google/blueprint/bootstrap.newGoBinaryModule
# Defined: build/soong/Blueprints:13:1
build .bootstrap/soong_build/obj/soong_build.a: g.bootstrap.gc $
${g.bootstrap.srcDir}/build/soong/cmd/soong_build/main.go | $
${g.bootstrap.gcCmd} $
.bootstrap/blueprint-parser/pkg/blueprint/parser.a $
.bootstrap/blueprint-proptools/pkg/blueprint/proptools.a $
.bootstrap/blueprint/pkg/blueprint.a $
.bootstrap/blueprint-deptools/pkg/blueprint/deptools.a $
.bootstrap/blueprint-pathtools/pkg/blueprint/pathtools.a $
.bootstrap/blueprint-bootstrap/pkg/blueprint/bootstrap.a $
.bootstrap/blueprint-parser/pkg/github.com/google/blueprint/parser.a $
.bootstrap/blueprint-proptools/pkg/github.com/google/blueprint/proptools.a $
.bootstrap/blueprint/pkg/github.com/google/blueprint.a $
.bootstrap/blueprint-deptools/pkg/github.com/google/blueprint/deptools.a $
.bootstrap/blueprint-pathtools/pkg/github.com/google/blueprint/pathtools.a $
.bootstrap/blueprint-bootstrap/pkg/github.com/google/blueprint/bootstrap.a $
.bootstrap/soong-glob/pkg/android/soong/glob.a $
.bootstrap/soong-common/pkg/android/soong/common.a $
.bootstrap/soong-config/pkg/android/soong/config.a $
@ -423,13 +434,13 @@ default .bootstrap/bin/soong_build
# Module: soong_glob
# Variant:
# Type: bootstrap_go_binary
# Factory: blueprint/bootstrap.newGoBinaryModule
# Factory: github.com/google/blueprint/bootstrap.newGoBinaryModule
# Defined: build/soong/Blueprints:29:1
build .bootstrap/soong_glob/obj/soong_glob.a: g.bootstrap.gc $
${g.bootstrap.srcDir}/build/soong/cmd/soong_glob/soong_glob.go | $
${g.bootstrap.gcCmd} $
.bootstrap/blueprint-deptools/pkg/blueprint/deptools.a $
.bootstrap/blueprint-deptools/pkg/github.com/google/blueprint/deptools.a $
.bootstrap/soong-glob/pkg/android/soong/glob.a
incFlags = -I .bootstrap/blueprint-deptools/pkg -I .bootstrap/soong-glob/pkg
pkgPath = soong_glob
@ -446,7 +457,7 @@ default .bootstrap/bin/soong_glob
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# Singleton: bootstrap
# Factory: blueprint/bootstrap.newSingleton
# Factory: github.com/google/blueprint/bootstrap.newSingleton
rule s.bootstrap.bigbp
command = .bootstrap/bin/soong_build -d .bootstrap/main.ninja.in.d -m ${g.bootstrap.bootstrapManifest} -o ${out} ${in}

4
cc/builder.go
View file

@ -21,8 +21,8 @@ package cc
import (
"android/soong/common"
"blueprint"
"blueprint/pathtools"
"github.com/google/blueprint"
"github.com/google/blueprint/pathtools"
"path/filepath"
"strings"
)

4
cc/cc.go
View file

@ -19,8 +19,8 @@ package cc
// is handled in builder.go
import (
"blueprint"
"blueprint/pathtools"
"github.com/google/blueprint"
"github.com/google/blueprint/pathtools"
"fmt"
"path/filepath"
"strings"

4
cmd/soong_build/main.go
View file

@ -20,8 +20,8 @@ import (
"os"
"path/filepath"
"blueprint"
"blueprint/bootstrap"
"github.com/google/blueprint"
"github.com/google/blueprint/bootstrap"
"android/soong/cc"
"android/soong/common"

4
common/arch.go
View file

@ -15,8 +15,8 @@
package common
import (
"blueprint"
"blueprint/proptools"
"github.com/google/blueprint"
"github.com/google/blueprint/proptools"
"fmt"
"reflect"
"runtime"

2
common/checkbuild.go
View file

@ -15,7 +15,7 @@
package common
import (
"blueprint"
"github.com/google/blueprint"
)
func CheckbuildSingleton() blueprint.Singleton {

2
common/defs.go
View file

@ -15,7 +15,7 @@
package common
import (
"blueprint"
"github.com/google/blueprint"
)
var (

4
common/glob.go
View file

@ -18,8 +18,8 @@ import (
"fmt"
"path/filepath"
"blueprint"
"blueprint/bootstrap"
"github.com/google/blueprint"
"github.com/google/blueprint/bootstrap"
"android/soong/glob"
)

4
common/module.go
View file

@ -15,7 +15,7 @@
package common
import (
"blueprint"
"github.com/google/blueprint"
"path/filepath"
)
@ -135,7 +135,7 @@ func InitAndroidArchModule(m AndroidModule, hod HostOrDeviceSupported, defaultMu
//
// import (
// "android/soong/common"
// "blueprint"
// "github.com/google/blueprint"
// )
//
// type myModule struct {

2
common/paths.go
View file

@ -17,7 +17,7 @@ package common
import (
"path/filepath"
"blueprint"
"github.com/google/blueprint"
)
type Config interface {

4
genrule/genrule.go
View file

@ -17,8 +17,8 @@ package genrule
import (
"path/filepath"
"blueprint"
"blueprint/pathtools"
"github.com/google/blueprint"
"github.com/google/blueprint/pathtools"
"android/soong/common"
)

2
glob/glob.go
View file

@ -20,7 +20,7 @@ import (
"path/filepath"
"strings"
"blueprint/deptools"
"github.com/google/blueprint/deptools"
)
func IsGlob(glob string) bool {