diff options
| author | Nan Zhang <nanzhang@google.com> | 2017-11-08 21:20:04 -0800 |
|---|---|---|
| committer | Nan Zhang <nanzhang@google.com> | 2017-11-08 21:25:40 -0800 |
| commit | ea568a4a241dc3ab2e415143a698413106cb4c52 (patch) | |
| tree | ab1bf9d248e1ff65144502581c2b7b0a7bb36ace /python/python.go | |
| parent | 99a5635733d45b30e4b38770e52243f3c46dac1e (diff) | |
Change bool, and string properties to *bool, and *string for java,
python, and genrule.
Test: m -j checkbuild
Bug: b/68853585
Change-Id: Ic9a8083818e920dc399a4b00841e2aa496f70faa
Diffstat (limited to 'python/python.go')
| -rw-r--r-- | python/python.go | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/python/python.go b/python/python.go index 1b146a8e8..9d6d6a795 100644 --- a/python/python.go +++ b/python/python.go @@ -65,7 +65,7 @@ type BaseProperties struct { // (from a.b.c import ...) statement. // if left unspecified, all the source/data files of current module are copied to // "runfiles/" tree directory directly. - Pkg_path string `android:"arch_variant"` + Pkg_path *string `android:"arch_variant"` // true, if the Python module is used internally, eg, Python std libs. Is_internal *bool `android:"arch_variant"` @@ -367,14 +367,14 @@ func (p *Module) GeneratePythonBuildActions(ctx android.ModuleContext) { expandedData := ctx.ExpandSources(p.properties.Data, nil) // sanitize pkg_path. - pkg_path := p.properties.Pkg_path + pkg_path := String(p.properties.Pkg_path) if pkg_path != "" { - pkg_path = filepath.Clean(p.properties.Pkg_path) + pkg_path = filepath.Clean(String(p.properties.Pkg_path)) if pkg_path == ".." || strings.HasPrefix(pkg_path, "../") || strings.HasPrefix(pkg_path, "/") { ctx.PropertyErrorf("pkg_path", "%q must be a relative path contained in par file.", - p.properties.Pkg_path) + String(p.properties.Pkg_path)) return } if p.properties.Is_internal != nil && *p.properties.Is_internal { @@ -557,3 +557,6 @@ func fillInMap(ctx android.ModuleContext, m map[string]string, return true } + +var Bool = proptools.Bool +var String = proptools.String |