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

Commit 45da465e authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I9e38ac73,I9412147f 

* changes:
  Honor PreventInstall for APKs and dexpreopt files
  Add dependency from hostdex installed module to Make intermediates
parents 008d1761 fa9bfcd0

java/androidmk.go

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ func (library *Library) AndroidMkEntriesHostDex() android.AndroidMkEntries { 
					if library.dexJarFile.IsSet() {

						entries.SetPath("LOCAL_SOONG_DEX_JAR", library.dexJarFile.Path())

					}

					entries.SetPath("LOCAL_SOONG_INSTALLED_MODULE", library.hostdexInstallFile)

					entries.SetPath("LOCAL_SOONG_HEADER_JAR", library.headerJarFile)

					entries.SetPath("LOCAL_SOONG_CLASSES_JAR", library.implementationAndResourcesJar)

					entries.SetString("LOCAL_MODULE_STEM", library.Stem()+"-hostdex")

java/app.go

+4 −1
Original line number Diff line number Diff line
@@ -471,6 +471,7 @@ func (a *AndroidApp) dexBuildActions(ctx android.ModuleContext) android.Path { 
	a.dexpreopter.enforceUsesLibs = a.usesLibrary.enforceUsesLibraries()

	a.dexpreopter.classLoaderContexts = a.classLoaderContexts

	a.dexpreopter.manifestFile = a.mergedManifestFile

	a.dexpreopter.preventInstall = a.appProperties.PreventInstall



	if ctx.ModuleName() != "framework-res" {

		a.Module.compile(ctx, a.aaptSrcJar)
@@ -720,7 +721,9 @@ func (a *AndroidApp) generateAndroidBuildActions(ctx android.ModuleContext) { 
	apexInfo := ctx.Provider(android.ApexInfoProvider).(android.ApexInfo)



	// Install the app package.

	if (Bool(a.Module.properties.Installable) || ctx.Host()) && apexInfo.IsForPlatform() {

	if (Bool(a.Module.properties.Installable) || ctx.Host()) && apexInfo.IsForPlatform() &&

		!a.appProperties.PreventInstall {



		var extraInstalledPaths android.Paths

		for _, extra := range a.extraOutputFiles {

			installed := ctx.InstallFile(a.installDir, extra.Base(), extra)

java/base.go

+3 −0
Original line number Diff line number Diff line
@@ -407,6 +407,9 @@ type Module struct { 
	// installed file for binary dependency

	installFile android.Path



	// installed file for hostdex copy

	hostdexInstallFile android.InstallPath



	// list of .java files and srcjars that was passed to javac

	compiledJavaSrcs android.Paths

	compiledSrcJars  android.Paths

java/dexpreopt.go

+2 −1
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ type dexpreopter struct { 
	isApp               bool

	isTest              bool

	isPresignedPrebuilt bool

	preventInstall      bool



	manifestFile        android.Path

	statusFile          android.WritablePath
@@ -356,7 +357,7 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Wr 
				installDirOnDevice:  installPath,

				installFileOnDevice: installBase,

			})

		} else {

		} else if !d.preventInstall {

			ctx.InstallFile(installPath, installBase, install.From)

		}

	}

java/java.go

+2 −1
Original line number Diff line number Diff line
@@ -571,7 +571,8 @@ func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) { 
		}

		hostDexNeeded := Bool(j.deviceProperties.Hostdex) && !ctx.Host()

		if hostDexNeeded {

			ctx.InstallFile(android.PathForHostDexInstall(ctx, "framework"),

			j.hostdexInstallFile = ctx.InstallFile(

				android.PathForHostDexInstall(ctx, "framework"),

				j.Stem()+"-hostdex.jar", j.outputFile)

		}

		var installDir android.InstallPath