Made ManifestPath OptionalPath instead of Path
because it is actually an optional value. Bug: 158843648 Test: m nothing Change-Id: If323eacf6a7aa83dcf5ce4825ad8cabeeaa97ac9
This commit is contained in:
@@ -276,9 +276,9 @@ func dexpreoptCommand(ctx android.PathContext, globalSoong *GlobalSoongConfig, g
|
||||
// no time/space is wasted on AOT-compiling modules that will fail CLC check on device.
|
||||
|
||||
var manifestOrApk android.Path
|
||||
if module.ManifestPath != nil {
|
||||
if module.ManifestPath.Valid() {
|
||||
// Ok, there is an XML manifest.
|
||||
manifestOrApk = module.ManifestPath
|
||||
manifestOrApk = module.ManifestPath.Path()
|
||||
} else if filepath.Ext(base) == ".apk" {
|
||||
// Ok, there is is an APK with the manifest inside.
|
||||
manifestOrApk = module.DexPath
|
||||
|
Reference in New Issue
Block a user