commit 33a3a8182f9833b75ab4fa14c27dcdc8667ae2cc
author Jeongik Cha <jeongik@google.com> Thu Apr 15 09:12:49 2021 +0900
committer Jeongik Cha <jeongik@google.com> Thu Apr 15 09:12:49 2021 +0900
tree ec30c3018b5bb38c0309c755617824dd31834760
parent bec4d038bb2447c84d10556a04e4f37ca9985291

Made ManifestPath OptionalPath instead of Path

because it is actually an optional value.

Bug: 158843648
Test: m nothing
Change-Id: If323eacf6a7aa83dcf5ce4825ad8cabeeaa97ac9

java/dexpreopt.go

diff --git a/java/dexpreopt.go b/java/dexpreopt.go
index b4cf012..3571590 100644
--- a/java/dexpreopt.go
+++ b/java/dexpreopt.go
@@ -221,7 +221,7 @@
 		DexLocation:     dexLocation,
 		BuildPath:       android.PathForModuleOut(ctx, "dexpreopt", ctx.ModuleName()+".jar").OutputPath,
 		DexPath:         dexJarFile,
-		ManifestPath:    d.manifestFile,
+		ManifestPath:    android.OptionalPathForPath(d.manifestFile),
 		UncompressedDex: d.uncompressedDex,
 		HasApkLibraries: false,
 		PreoptFlags:     nil,