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

Commit 9b910824 authored by Ulyana Trafimovich's avatar Ulyana Trafimovich Committed by Gerrit Code Review
Browse files

Merge "Don't write nonexistent DEX file paths to dexpreopt.config files."

parents b8887127 c0f64799

java/dexpreopt.go

+1 −4
Original line number Diff line number Diff line
@@ -129,8 +129,6 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Wr 


	dexLocation := android.InstallPathToOnDevicePath(ctx, d.installPath)



	buildPath := android.PathForModuleOut(ctx, "dexpreopt", ctx.ModuleName()+".jar").OutputPath



	providesUsesLib := ctx.ModuleName()

	if ulib, ok := ctx.Module().(ProvidesUsesLib); ok {

		name := ulib.ProvidesUsesLib()
@@ -146,7 +144,6 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Wr 
		slimDexpreoptConfig := &dexpreopt.ModuleConfig{

			Name:                 ctx.ModuleName(),

			DexLocation:          dexLocation,

			BuildPath:            buildPath,

			EnforceUsesLibraries: d.enforceUsesLibs,

			ProvidesUsesLibrary:  providesUsesLib,

			ClassLoaderContexts:  d.classLoaderContexts,
@@ -218,7 +215,7 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Wr 
	dexpreoptConfig := &dexpreopt.ModuleConfig{

		Name:            ctx.ModuleName(),

		DexLocation:     dexLocation,

		BuildPath:       buildPath,

		BuildPath:       android.PathForModuleOut(ctx, "dexpreopt", ctx.ModuleName()+".jar").OutputPath,

		DexPath:         dexJarFile,

		ManifestPath:    d.manifestFile,

		UncompressedDex: d.uncompressedDex,