Add ":name" support for manifest and androidManifest properties in apex
The manifest and androidManifest properties in the apex module type now
supports ":name" syntax.
Bug: 123857186
Test: m (apex_test amended)
Change-Id: Ic4e5a73cf73260d156ec61d07932ad07b2561413
diff --git a/apex/apex.go b/apex/apex.go
index 7633ad2..3b06a99 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -511,6 +511,14 @@
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 {
@@ -793,7 +801,7 @@
certificate = java.Certificate{pem, key}
}
- manifest := android.PathForModuleSrc(ctx, proptools.StringDefault(a.properties.Manifest, "apex_manifest.json"))
+ manifest := ctx.ExpandSource(proptools.StringDefault(a.properties.Manifest, "apex_manifest.json"), "manifest")
var abis []string
for _, target := range ctx.MultiTargets() {
@@ -890,7 +898,7 @@
}
if a.properties.AndroidManifest != nil {
- androidManifestFile := android.PathForModuleSrc(ctx, proptools.String(a.properties.AndroidManifest))
+ androidManifestFile := ctx.ExpandSource(proptools.String(a.properties.AndroidManifest), "androidManifest")
implicitInputs = append(implicitInputs, androidManifestFile)
optFlags = append(optFlags, "--android_manifest "+androidManifestFile.String())
}
@@ -969,7 +977,7 @@
if a.installable() {
// For flattened APEX, do nothing but make sure that apex_manifest.json file is also copied along
// with other ordinary files.
- manifest := android.PathForModuleSrc(ctx, proptools.StringDefault(a.properties.Manifest, "apex_manifest.json"))
+ manifest := ctx.ExpandSource(proptools.StringDefault(a.properties.Manifest, "apex_manifest.json"), "manifest")
// rename to apex_manifest.json
copiedManifest := android.PathForModuleOut(ctx, "apex_manifest.json")