diff options
Diffstat (limited to 'python/python.go')
| -rw-r--r-- | python/python.go | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/python/python.go b/python/python.go index d7b1bbad4..7e376c608 100644 --- a/python/python.go +++ b/python/python.go @@ -197,7 +197,7 @@ func (p *Module) GetSrcsZip() android.Path { var _ PythonDependency = (*Module)(nil) -var _ android.AndroidMkDataProvider = (*Module)(nil) +var _ android.AndroidMkEntriesProvider = (*Module)(nil) func (p *Module) Init() android.Module { @@ -217,11 +217,17 @@ type dependencyTag struct { name string } +type installDependencyTag struct { + blueprint.BaseDependencyTag + android.InstallAlwaysNeededDependencyTag + name string +} + var ( pythonLibTag = dependencyTag{name: "pythonLib"} javaDataTag = dependencyTag{name: "javaData"} launcherTag = dependencyTag{name: "launcher"} - launcherSharedLibTag = dependencyTag{name: "launcherSharedLib"} + launcherSharedLibTag = installDependencyTag{name: "launcherSharedLib"} pyIdentifierRegexp = regexp.MustCompile(`^[a-zA-Z_][a-zA-Z0-9_-]*$`) pyExt = ".py" protoExt = ".proto" @@ -336,6 +342,7 @@ func (p *Module) DepsMutator(ctx android.BottomUpMutatorContext) { // cannot read the property at this stage and it will be too late to add // dependencies later. ctx.AddFarVariationDependencies(ctx.Target().Variations(), launcherSharedLibTag, "libsqlite") + ctx.AddFarVariationDependencies(ctx.Target().Variations(), launcherSharedLibTag, "libc++") if ctx.Target().Os.Bionic() { ctx.AddFarVariationDependencies(ctx.Target().Variations(), launcherSharedLibTag, |