From 27b922f53e938896c0a693a1d9f50e6c9e686ad7 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Mon, 4 Mar 2019 22:35:41 -0800 Subject: Annotate paths and deprecate ExtractSource(s)Deps Add `android:"path"` to all properties that take paths to source files, and remove the calls to ExtractSource(s)Deps, the pathsDepsMutator will add the necessary SourceDepTag dependency. Test: All soong tests Change-Id: I488ba1a5d680aaa50b04fc38acf693e23c6d4d6d --- xml/xml.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'xml/xml.go') diff --git a/xml/xml.go b/xml/xml.go index 218d73ce3..d89327f51 100644 --- a/xml/xml.go +++ b/xml/xml.go @@ -58,7 +58,7 @@ func init() { type prebuiltEtcXmlProperties struct { // Optional DTD that will be used to validate the xml file. - Schema *string + Schema *string `android:"path"` } type prebuiltEtcXml struct { @@ -73,9 +73,6 @@ func (p *prebuiltEtcXml) timestampFilePath(ctx android.ModuleContext) android.Wr func (p *prebuiltEtcXml) DepsMutator(ctx android.BottomUpMutatorContext) { p.PrebuiltEtc.DepsMutator(ctx) - - // To support ":modulename" in schema - android.ExtractSourceDeps(ctx, p.properties.Schema) } func (p *prebuiltEtcXml) GenerateAndroidBuildActions(ctx android.ModuleContext) { -- cgit v1.2.3-59-g8ed1b