From 8a49795df1ed87a4889f267dbd8d28c5832bb897 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 5 Mar 2019 22:25:09 -0800 Subject: Replace ctx.ExpandSources with android.PathsForModuleSrc Move the logic from ctx.ExpandSources into android.PathsForModuleSrc and ctx.ExpandSource into android.PathForModuleSrc, and deprecate them. When combined with the pathDepsMutator this will let all properties that take source paths also take filegroups or genrule outputs, as long as they are tagged with `android:"path"`. Test: All soong tests Change-Id: I01625e76b5da19240e9649bf26a014eeeafcab8f --- python/python.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'python/python.go') diff --git a/python/python.go b/python/python.go index 6d160201c..6eb9b6ef3 100644 --- a/python/python.go +++ b/python/python.go @@ -414,7 +414,7 @@ func (p *Module) GeneratePythonBuildActions(ctx android.ModuleContext) { panic(fmt.Errorf("unknown Python Actual_version: %q for module: %q.", p.properties.Actual_version, ctx.ModuleName())) } - expandedSrcs := ctx.ExpandSources(srcs, exclude_srcs) + expandedSrcs := android.PathsForModuleSrcExcludes(ctx, srcs, exclude_srcs) requiresSrcs := true if p.bootstrapper != nil && !p.bootstrapper.autorun() { requiresSrcs = false @@ -424,7 +424,7 @@ func (p *Module) GeneratePythonBuildActions(ctx android.ModuleContext) { } // expand data files from "data" property. - expandedData := ctx.ExpandSources(p.properties.Data, nil) + expandedData := android.PathsForModuleSrc(ctx, p.properties.Data) // sanitize pkg_path. pkgPath := String(p.properties.Pkg_path) -- cgit v1.2.3-59-g8ed1b