diff options
Diffstat (limited to 'apex/builder.go')
| -rw-r--r-- | apex/builder.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apex/builder.go b/apex/builder.go index 6f645ab04..bfe16922d 100644 --- a/apex/builder.go +++ b/apex/builder.go @@ -704,7 +704,7 @@ func (a *apexBundle) buildApex(ctx android.ModuleContext) { optFlags = append(optFlags, "--override_apk_package_name "+manifestPackageName) } - androidManifest := a.properties.AndroidManifest.GetOrDefault(a.ConfigurableEvaluator(ctx), "") + androidManifest := a.properties.AndroidManifest.GetOrDefault(ctx, "") if androidManifest != "" { androidManifestFile := android.PathForModuleSrc(ctx, androidManifest) @@ -1196,7 +1196,7 @@ func (a *apexBundle) buildCannedFsConfig(ctx android.ModuleContext, defaultReadO } // Custom fs_config is "appended" to the last so that entries from the file are preferred // over default ones set above. - customFsConfig := a.properties.Canned_fs_config.GetOrDefault(a.ConfigurableEvaluator(ctx), "") + customFsConfig := a.properties.Canned_fs_config.GetOrDefault(ctx, "") if customFsConfig != "" { cmd.Text("cat").Input(android.PathForModuleSrc(ctx, customFsConfig)) } |