Merge "relax the restriction on .proto files in data" into main (cfac8c1b) · Commits · e / os / android_build_soong

python/python.go

+10 −10

Original line number	Diff line number	Diff line
		@@ -506,8 +506,8 @@ func (p *PythonLibraryModule) genModulePathMappings(ctx android.ModuleContext, p
		}

		for _, d := range expandedData {
		if d.Ext() == pyExt \|\| d.Ext() == protoExt {
		ctx.PropertyErrorf("data", "found (.py\|.proto) file: %q!", d.String())
		if d.Ext() == pyExt {
		ctx.PropertyErrorf("data", "found (.py) file: %q!", d.String())
		continue
		}
		runfilesPath := filepath.Join(pkgPath, d.Rel())
		@@ -523,20 +523,20 @@ func (p *PythonLibraryModule) createSrcsZip(ctx android.ModuleContext, pkgPath s
		relativeRootMap := make(map[string]android.Paths)
		var protoSrcs android.Paths
		addPathMapping := func(path pathMapping) {
		// handle proto sources separately
		if path.src.Ext() == protoExt {
		protoSrcs = append(protoSrcs, path.src)
		} else {
		relativeRoot := strings.TrimSuffix(path.src.String(), path.src.Rel())
		relativeRootMap[relativeRoot] = append(relativeRootMap[relativeRoot], path.src)
		}
		}

		// "srcs" or "data" properties may contain filegroups so it might happen that
		// the root directory for each source path is different.
		for _, path := range p.srcsPathMappings {
		// handle proto sources separately
		if path.src.Ext() == protoExt {
		protoSrcs = append(protoSrcs, path.src)
		} else {
		addPathMapping(path)
		}
		}
		for _, path := range p.dataPathMappings {
		addPathMapping(path)
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -50,7 +50,7 @@ var (
		" Second file: in module %s at path %q."
		noSrcFileErr = moduleVariantErrTemplate + "doesn't have any source files!"
		badSrcFileExtErr = moduleVariantErrTemplate + "srcs: found non (.py\|.proto) file: %q!"
		badDataFileExtErr = moduleVariantErrTemplate + "data: found (.py\|.proto) file: %q!"
		badDataFileExtErr = moduleVariantErrTemplate + "data: found (.py) file: %q!"
		bpFile = "Android.bp"

		data = []struct {