diff options
| author | 2019-03-20 12:48:29 -0700 | |
|---|---|---|
| committer | 2019-03-20 12:48:29 -0700 | |
| commit | 3cafca1d18a9438c6f49378a5af641f23f28d1e1 (patch) | |
| tree | 69a57f74d62a78a22712d3714c7c13b1dcad231c /apex/apex.go | |
| parent | 055d480456518a0000af118a0821398287e1c786 (diff) | |
| parent | 9bcee1f400034e4a782b2dd393a3af5f0e3edd4a (diff) | |
Replace ctx.ExpandSources with android.PathsForModuleSrc am: 8a49795df1
am: 9bcee1f400
Change-Id: Ie94f2abc0526f8121e1edf3230bd63134e552ff2
Diffstat (limited to 'apex/apex.go')
| -rw-r--r-- | apex/apex.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apex/apex.go b/apex/apex.go index 04b70d447..ad1ef74f7 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -839,7 +839,7 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext, apexType ap a.container_private_key_file = key } - manifest := ctx.ExpandSource(proptools.StringDefault(a.properties.Manifest, "apex_manifest.json"), "manifest") + manifest := android.PathForModuleSrc(ctx, proptools.StringDefault(a.properties.Manifest, "apex_manifest.json")) var abis []string for _, target := range ctx.MultiTargets() { @@ -936,7 +936,7 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext, apexType ap } if a.properties.AndroidManifest != nil { - androidManifestFile := ctx.ExpandSource(proptools.String(a.properties.AndroidManifest), "androidManifest") + androidManifestFile := android.PathForModuleSrc(ctx, proptools.String(a.properties.AndroidManifest)) implicitInputs = append(implicitInputs, androidManifestFile) optFlags = append(optFlags, "--android_manifest "+androidManifestFile.String()) } @@ -1015,7 +1015,7 @@ func (a *apexBundle) buildFlattenedApex(ctx android.ModuleContext) { 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 := ctx.ExpandSource(proptools.StringDefault(a.properties.Manifest, "apex_manifest.json"), "manifest") + manifest := android.PathForModuleSrc(ctx, proptools.StringDefault(a.properties.Manifest, "apex_manifest.json")) // rename to apex_manifest.json copiedManifest := android.PathForModuleOut(ctx, "apex_manifest.json") |