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
diff --git a/apex/apex.go b/apex/apex.go
index f72eef3..341968b 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -212,11 +212,11 @@
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 @@
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 {