Merge "Remove the return value from dexpreopt" (4eb50485) · Commits · e / os / android_build_soong

java/app.go

+5 −5

Original line number	Diff line number	Diff line
		@@ -1546,11 +1546,11 @@ func (a *AndroidAppImport) generateAndroidBuildActions(ctx android.ModuleContext
		a.dexpreopter.enforceUsesLibs = a.usesLibrary.enforceUsesLibraries()
		a.dexpreopter.classLoaderContexts = a.usesLibrary.classLoaderContextForUsesLibDeps(ctx)

		dexOutput := a.dexpreopter.dexpreopt(ctx, jnisUncompressed)
		a.dexpreopter.dexpreopt(ctx, jnisUncompressed)
		if a.dexpreopter.uncompressedDex {
		dexUncompressed := android.PathForModuleOut(ctx, "dex-uncompressed", ctx.ModuleName()+".apk")
		a.uncompressDex(ctx, dexOutput, dexUncompressed.OutputPath)
		dexOutput = dexUncompressed
		a.uncompressDex(ctx, jnisUncompressed, dexUncompressed.OutputPath)
		jnisUncompressed = dexUncompressed
		}

		apkFilename := proptools.StringDefault(a.properties.Filename, a.BaseModuleName()+".apk")
		@@ -1574,11 +1574,11 @@ func (a *AndroidAppImport) generateAndroidBuildActions(ctx android.ModuleContext
		if lineage := String(a.properties.Lineage); lineage != "" {
		lineageFile = android.PathForModuleSrc(ctx, lineage)
		}
		SignAppPackage(ctx, signed, dexOutput, certificates, nil, lineageFile)
		SignAppPackage(ctx, signed, jnisUncompressed, certificates, nil, lineageFile)
		a.outputFile = signed
		} else {
		alignedApk := android.PathForModuleOut(ctx, "zip-aligned", apkFilename)
		TransformZipAlign(ctx, alignedApk, dexOutput)
		TransformZipAlign(ctx, alignedApk, jnisUncompressed)
		a.outputFile = alignedApk
		a.certificate = PresignedCertificate
		}

+3 −5

Original line number	Diff line number	Diff line
		@@ -112,13 +112,13 @@ func odexOnSystemOther(ctx android.ModuleContext, installPath android.InstallPat
		return dexpreopt.OdexOnSystemOtherByName(ctx.ModuleName(), android.InstallPathToOnDevicePath(ctx, installPath), dexpreopt.GetGlobalConfig(ctx))
		}

		func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.ModuleOutPath) android.ModuleOutPath {
		func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.ModuleOutPath) {
		// TODO(b/148690468): The check on d.installPath is to bail out in cases where
		// the dexpreopter struct hasn't been fully initialized before we're called,
		// e.g. in aar.go. This keeps the behaviour that dexpreopting is effectively
		// disabled, even if installable is true.
		if d.dexpreoptDisabled(ctx) \|\| d.installPath.Base() == "." {
		return dexJarFile
		return
		}

		globalSoong := dexpreopt.GetGlobalSoongConfig(ctx)
		@@ -213,12 +213,10 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Mo
		dexpreoptRule, err := dexpreopt.GenerateDexpreoptRule(ctx, globalSoong, global, dexpreoptConfig)
		if err != nil {
		ctx.ModuleErrorf("error generating dexpreopt rule: %s", err.Error())
		return dexJarFile
		return
		}

		dexpreoptRule.Build("dexpreopt", "dexpreopt")

		d.builtInstalled = dexpreoptRule.Installs().String()

		return dexJarFile
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -1786,7 +1786,7 @@ func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar android.Path) {
		j.dexJarFile = dexOutputFile

		// Dexpreopting
		dexOutputFile = j.dexpreopt(ctx, dexOutputFile)
		j.dexpreopt(ctx, dexOutputFile)

		j.maybeStrippedDexJarFile = dexOutputFile

		@@ -3123,7 +3123,7 @@ func (j *DexImport) GenerateAndroidBuildActions(ctx android.ModuleContext) {

		j.dexJarFile = dexOutputFile

		dexOutputFile = j.dexpreopt(ctx, dexOutputFile)
		j.dexpreopt(ctx, dexOutputFile)

		j.maybeStrippedDexJarFile = dexOutputFile