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

Commit 4bdea39a authored by Nicolas Geoffray's avatar Nicolas Geoffray
Browse files

Don't install java libraries that are already in an apex. 

This need to have -hostdex rules not look at the installFile.
In the near future, all -hostdex files come from jars that are in an apex.

bug: 119868597
Test: m
Change-Id: I4423626c5ced5d098ddd97c122fbfced54f817fc
parent 1eb88bb4

java/androidmk.go

+0 −3
Original line number Diff line number Diff line
@@ -33,9 +33,6 @@ func (library *Library) AndroidMkHostDex(w io.Writer, name string, data android. 
		} else {

			fmt.Fprintln(w, "LOCAL_PREBUILT_MODULE_FILE :=", library.implementationAndResourcesJar.String())

		}

		if library.installFile == nil {

			fmt.Fprintln(w, "LOCAL_UNINSTALLABLE_MODULE := true")

		}

		if library.dexJarFile != nil {

			fmt.Fprintln(w, "LOCAL_SOONG_DEX_JAR :=", library.dexJarFile.String())

		}

java/java.go

+1 −1
Original line number Diff line number Diff line
@@ -1395,7 +1395,7 @@ func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) { 
	j.deviceProperties.UncompressDex = j.shouldUncompressDex(ctx)

	j.compile(ctx)



	if Bool(j.properties.Installable) || ctx.Host() {

	if (Bool(j.properties.Installable) || ctx.Host()) && !android.DirectlyInAnyApex(ctx, ctx.ModuleName()) {

		if j.deviceProperties.UncompressDex {

			alignedOutputFile := android.PathForModuleOut(ctx, "aligned", ctx.ModuleName()+".jar")

			TransformZipAlign(ctx, alignedOutputFile, j.outputFile)