Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e269711 authored by Paul Duffin's avatar Paul Duffin Committed by Gerrit Code Review
Browse files

Merge "Improve error messages for missing dependencies"

parents 678ddb9d 7f48eeff

java/dexpreopt_bootjars.go

+2 −2
Original line number Diff line number Diff line
@@ -506,7 +506,7 @@ func buildBootImage(ctx android.SingletonContext, image *bootImageConfig) *bootI 
			m := image.modules.Jar(i)

			if ctx.Config().AllowMissingDependencies() {

				missingDeps = append(missingDeps, m)

				bootDexJars[i] = android.PathForOutput(ctx, "missing")

				bootDexJars[i] = android.PathForOutput(ctx, "missing/module", m, "from/apex", image.modules.Apex(i))

			} else {

				ctx.Errorf("failed to find a dex jar path for module '%s'"+

					", note that some jars may be filtered out by module constraints", m)
@@ -779,7 +779,7 @@ func bootFrameworkProfileRule(ctx android.SingletonContext, image *bootImageConf 
			bootFrameworkProfile = path.Path()

		} else {

			missingDeps = append(missingDeps, defaultProfile)

			bootFrameworkProfile = android.PathForOutput(ctx, "missing")

			bootFrameworkProfile = android.PathForOutput(ctx, "missing", defaultProfile)

		}



		profile := image.dir.Join(ctx, "boot.bprof")

java/hiddenapi_singleton.go

+4 −3
Original line number Diff line number Diff line
@@ -177,12 +177,13 @@ func stubFlagsRule(ctx android.SingletonContext) { 
	for moduleList, pathList := range moduleListToPathList {

		for i := range pathList {

			if pathList[i] == nil {

				pathList[i] = android.PathForOutput(ctx, "missing")

				moduleName := (*moduleList)[i]

				pathList[i] = android.PathForOutput(ctx, "missing/module", moduleName)

				if ctx.Config().AllowMissingDependencies() {

					missingDeps = append(missingDeps, (*moduleList)[i])

					missingDeps = append(missingDeps, moduleName)

				} else {

					ctx.Errorf("failed to find dex jar path for module %q",

						(*moduleList)[i])

						moduleName)

				}

			}

		}