diff options
| author | 2019-03-04 22:35:41 -0800 | |
|---|---|---|
| committer | 2019-03-07 18:36:35 +0000 | |
| commit | 27b922f53e938896c0a693a1d9f50e6c9e686ad7 (patch) | |
| tree | d3383cbdebb9fb78d8d96fa3a3023764620d483e /java/aar.go | |
| parent | 1b48842a4b83ba6234d26ff4c77a0884f5008f62 (diff) | |
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
Diffstat (limited to 'java/aar.go')
| -rw-r--r-- | java/aar.go | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/java/aar.go b/java/aar.go index c30632ea9..3f13e59c1 100644 --- a/java/aar.go +++ b/java/aar.go @@ -64,10 +64,10 @@ type aaptProperties struct { Resource_dirs []string // list of zip files containing Android resources. - Resource_zips []string + Resource_zips []string `android:"path"` // path to AndroidManifest.xml. If unset, defaults to "AndroidManifest.xml". - Manifest *string + Manifest *string `android:"path"` } type aapt struct { @@ -180,8 +180,6 @@ func (a *aapt) deps(ctx android.BottomUpMutatorContext, sdkContext sdkContext) { if sdkDep.frameworkResModule != "" { ctx.AddVariationDependencies(nil, frameworkResTag, sdkDep.frameworkResModule) } - - android.ExtractSourcesDeps(ctx, a.aaptProperties.Resource_zips) } func (a *aapt) buildActions(ctx android.ModuleContext, sdkContext sdkContext, extraLinkFlags ...string) { @@ -406,7 +404,7 @@ func AndroidLibraryFactory() android.Module { // type AARImportProperties struct { - Aars []string + Aars []string `android:"path"` Sdk_version *string Min_sdk_version *string |