StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't cache InstallInData" am: a7d1d4b0aa

Browse Source 
am: 0a8fe7cf0d

Change-Id: Ic35a3cde1561986411679c33bdd56e9e97abd6ea
This commit is contained in:
Colin Cross
2016-08-04 21:45:46 +00:00
committed by android-build-merger
parent fe90232a83 0a8fe7cf0d
commit 36a70cafea
1 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
android/module.go
View File

@@ -56,8 +56,6 @@ type androidBaseContext interface {
Darwin() bool Darwin() bool
Debug() bool Debug() bool
AConfig() Config AConfig() Config
Proprietary() bool
InstallInData() bool
} }
type BaseContext interface { type BaseContext interface {
@@ -82,6 +80,9 @@ type ModuleContext interface {
CheckbuildFile(srcPath Path) CheckbuildFile(srcPath Path)
AddMissingDependencies(deps []string) AddMissingDependencies(deps []string)
Proprietary() bool
InstallInData() bool
} }
type Module interface { type Module interface {
@@ -388,14 +389,13 @@ func (a *ModuleBase) generateModuleTarget(ctx blueprint.ModuleContext) {
func (a *ModuleBase) androidBaseContextFactory(ctx blueprint.BaseModuleContext) androidBaseContextImpl { func (a *ModuleBase) androidBaseContextFactory(ctx blueprint.BaseModuleContext) androidBaseContextImpl {
return androidBaseContextImpl{ return androidBaseContextImpl{
target: a.commonProperties.CompileTarget, target: a.commonProperties.CompileTarget,
proprietary: a.commonProperties.Proprietary,
config: ctx.Config().(Config), config: ctx.Config().(Config),
installInData: a.module.InstallInData(),
} }
} }
func (a *ModuleBase) GenerateBuildActions(ctx blueprint.ModuleContext) { func (a *ModuleBase) GenerateBuildActions(ctx blueprint.ModuleContext) {
androidCtx := &androidModuleContext{ androidCtx := &androidModuleContext{
module: a.module,
ModuleContext: ctx, ModuleContext: ctx,
androidBaseContextImpl: a.androidBaseContextFactory(ctx), androidBaseContextImpl: a.androidBaseContextFactory(ctx),
installDeps: a.computeInstallDeps(ctx), installDeps: a.computeInstallDeps(ctx),
@@ -425,8 +425,6 @@ type androidBaseContextImpl struct {
target Target target Target
debug bool debug bool
config Config config Config
proprietary bool
installInData bool
} }
type androidModuleContext struct { type androidModuleContext struct {
@@ -436,6 +434,7 @@ type androidModuleContext struct {
installFiles Paths installFiles Paths
checkbuildFiles Paths checkbuildFiles Paths
missingDeps []string missingDeps []string
module Module
} }
func (a *androidModuleContext) ninjaError(outputs []string, err error) { func (a *androidModuleContext) ninjaError(outputs []string, err error) {
@@ -533,12 +532,12 @@ func (a *androidBaseContextImpl) AConfig() Config {
return a.config return a.config
} }
func (a *androidBaseContextImpl) Proprietary() bool { func (a *androidModuleContext) Proprietary() bool {
return a.proprietary return a.module.base().commonProperties.Proprietary
} }
func (a *androidBaseContextImpl) InstallInData() bool { func (a *androidModuleContext) InstallInData() bool {
return a.installInData return a.module.InstallInData()
} }
func (a *androidModuleContext) InstallFileName(installPath OutputPath, name string, srcPath Path, func (a *androidModuleContext) InstallFileName(installPath OutputPath, name string, srcPath Path,