diff options
| author | Colin Cross <ccross@android.com> | 2019-03-04 22:35:41 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2019-03-07 18:36:35 +0000 |
| commit | 27b922f53e938896c0a693a1d9f50e6c9e686ad7 (patch) | |
| tree | d3383cbdebb9fb78d8d96fa3a3023764620d483e /apex/apex.go | |
| parent | 1b48842a4b83ba6234d26ff4c77a0884f5008f62 (diff) | |
| download | build_soong-27b922f53e938896c0a693a1d9f50e6c9e686ad7.tar.gz build_soong-27b922f53e938896c0a693a1d9f50e6c9e686ad7.tar.bz2 build_soong-27b922f53e938896c0a693a1d9f50e6c9e686ad7.zip | |
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 'apex/apex.go')
| -rw-r--r-- | apex/apex.go | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/apex/apex.go b/apex/apex.go index f72eef3a..341968bd 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -212,11 +212,11 @@ type apexMultilibProperties struct { type apexBundleProperties struct { // Json manifest file describing meta info of this APEX bundle. Default: // "apex_manifest.json" - Manifest *string + Manifest *string `android:"path"` // AndroidManifest.xml file used for the zip container of this APEX bundle. // If unspecified, a default one is automatically generated. - AndroidManifest *string + AndroidManifest *string `android:"path"` // Determines the file contexts file for setting security context to each file in this APEX bundle. // Specifically, when this is set to <value>, /system/sepolicy/apex/<value>_file_contexts file is @@ -525,14 +525,6 @@ func (a *apexBundle) DepsMutator(ctx android.BottomUpMutatorContext) { if cert != "" { ctx.AddDependency(ctx.Module(), certificateTag, cert) } - - if String(a.properties.Manifest) != "" { - android.ExtractSourceDeps(ctx, a.properties.Manifest) - } - - if String(a.properties.AndroidManifest) != "" { - android.ExtractSourceDeps(ctx, a.properties.AndroidManifest) - } } func (a *apexBundle) getCertString(ctx android.BaseContext) string { |