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

Merge "Fixed the issue of dependencyTag in prebuilt.go"

Browse source
This commit is contained in:
Treehugger Robot 2017-03-17 18:46:50 +00:00 committed by Gerrit Code Review
commit 6bdcc8ddd6
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
android/prebuilt.go
View file

@ -19,7 +19,11 @@ import "github.com/google/blueprint"
// This file implements common functionality for handling modules that may exist as prebuilts, // This file implements common functionality for handling modules that may exist as prebuilts,
// source, or both. // source, or both.
var prebuiltDependencyTag blueprint.BaseDependencyTag type prebuiltDependencyTag struct {
blueprint.BaseDependencyTag
}
var prebuiltDepTag prebuiltDependencyTag
type Prebuilt struct { type Prebuilt struct {
Properties struct { Properties struct {
@ -64,7 +68,7 @@ func prebuiltMutator(ctx BottomUpMutatorContext) {
p := m.Prebuilt() p := m.Prebuilt()
name := m.base().BaseModuleName() name := m.base().BaseModuleName()
if ctx.OtherModuleExists(name) { if ctx.OtherModuleExists(name) {
ctx.AddReverseDependency(ctx.Module(), prebuiltDependencyTag, name) ctx.AddReverseDependency(ctx.Module(), prebuiltDepTag, name)
p.Properties.SourceExists = true p.Properties.SourceExists = true
} else { } else {
ctx.Rename(name) ctx.Rename(name)
@ -77,7 +81,7 @@ func prebuiltMutator(ctx BottomUpMutatorContext) {
func PrebuiltSelectModuleMutator(ctx TopDownMutatorContext) { func PrebuiltSelectModuleMutator(ctx TopDownMutatorContext) {
if s, ok := ctx.Module().(Module); ok { if s, ok := ctx.Module().(Module); ok {
ctx.VisitDirectDeps(func(m blueprint.Module) { ctx.VisitDirectDeps(func(m blueprint.Module) {
if ctx.OtherModuleDependencyTag(m) == prebuiltDependencyTag { if ctx.OtherModuleDependencyTag(m) == prebuiltDepTag {
p := m.(PrebuiltInterface).Prebuilt() p := m.(PrebuiltInterface).Prebuilt()
if p.usePrebuilt(ctx, s) { if p.usePrebuilt(ctx, s) {
p.Properties.UsePrebuilt = true p.Properties.UsePrebuilt = true