Fix ctx.InstallFile calls for java modules am: 1d0eb7a9d0 am: c871fe905e am: 406461d954 am: 0978bcd3c1

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1880649

Change-Id: Ifb924fd88bf86cac1e7e68c31743807a9a38f9c6

android/paths.go

@@ -1661,6 +1661,12 @@ func PathForModuleInstall(ctx ModuleInstallPathContext, pathComponents ...string
 	return makePathForInstall(ctx, os, arch, partition, ctx.Debug(), pathComponents...)
 }
 
+// PathForHostDexInstall returns an InstallPath representing the install path for the
+// module appended with paths...
+func PathForHostDexInstall(ctx ModuleInstallPathContext, pathComponents ...string) InstallPath {
+	return makePathForInstall(ctx, ctx.Config().BuildOS, ctx.Config().BuildArch, "", ctx.Debug(), pathComponents...)
+}
+
 // PathForModuleInPartitionInstall is similar to PathForModuleInstall but partition is provided by the caller
 func PathForModuleInPartitionInstall(ctx ModuleInstallPathContext, partition string, pathComponents ...string) InstallPath {
 	os, arch := osAndArch(ctx)

java/app.go

@@ -721,10 +721,12 @@ func (a *AndroidApp) generateAndroidBuildActions(ctx android.ModuleContext) {
 
 	// Install the app package.
 	if (Bool(a.Module.properties.Installable) || ctx.Host()) && apexInfo.IsForPlatform() {
-		ctx.InstallFile(a.installDir, a.outputFile.Base(), a.outputFile)
+		var extraInstalledPaths android.Paths
 		for _, extra := range a.extraOutputFiles {
-			ctx.InstallFile(a.installDir, extra.Base(), extra)
+			installed := ctx.InstallFile(a.installDir, extra.Base(), extra)
+			extraInstalledPaths = append(extraInstalledPaths, installed)
 		}
+		ctx.InstallFile(a.installDir, a.outputFile.Base(), a.outputFile, extraInstalledPaths...)
 	}
 
 	a.buildAppDependencyInfo(ctx)

java/dexpreopt.go

@@ -335,17 +335,19 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Wr
 
 	dexpreoptRule.Build("dexpreopt", "dexpreopt")
 
-	if global.ApexSystemServerJars.ContainsJar(moduleName(ctx)) {
+	for _, install := range dexpreoptRule.Installs() {
-		// APEX variants of java libraries are hidden from Make, so their dexpreopt outputs need special
+		// Remove the "/" prefix because the path should be relative to $ANDROID_PRODUCT_OUT.
-		// handling. Currently, for APEX variants of java libraries, only those in the system server
+		installDir := strings.TrimPrefix(filepath.Dir(install.To), "/")
-		// classpath are handled here. Preopting of boot classpath jars in the ART APEX are handled in
+		installBase := filepath.Base(install.To)
-		// java/dexpreopt_bootjars.go, and other APEX jars are not preopted.
+		arch := filepath.Base(installDir)
-		for _, install := range dexpreoptRule.Installs() {
+		installPath := android.PathForModuleInPartitionInstall(ctx, "", installDir)
-			// Remove the "/" prefix because the path should be relative to $ANDROID_PRODUCT_OUT.
+
-			installDir := strings.TrimPrefix(filepath.Dir(install.To), "/")
+		if global.ApexSystemServerJars.ContainsJar(moduleName(ctx)) {
-			installBase := filepath.Base(install.To)
+			// APEX variants of java libraries are hidden from Make, so their dexpreopt
-			arch := filepath.Base(installDir)
+			// outputs need special handling. Currently, for APEX variants of java
-			installPath := android.PathForModuleInPartitionInstall(ctx, "", installDir)
+			// libraries, only those in the system server classpath are handled here.
+			// Preopting of boot classpath jars in the ART APEX are handled in
+			// java/dexpreopt_bootjars.go, and other APEX jars are not preopted.
 			// The installs will be handled by Make as sub-modules of the java library.
 			d.builtInstalledForApex = append(d.builtInstalledForApex, dexpreopterInstall{
 				name:                arch + "-" + installBase,
@@ -354,10 +356,12 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Wr
 				installDirOnDevice:  installPath,
 				installFileOnDevice: installBase,
 			})
+		} else {
+			ctx.InstallFile(installPath, installBase, install.From)
 		}
-	} else {
+	}
-		// The installs will be handled by Make as LOCAL_SOONG_BUILT_INSTALLED of the java library
+
-		// module.
+	if !global.ApexSystemServerJars.ContainsJar(moduleName(ctx)) {
 		d.builtInstalled = dexpreoptRule.Installs().String()
 	}
 }

java/java.go

@@ -567,8 +567,22 @@ func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) {
 		if j.InstallMixin != nil {
 			extraInstallDeps = j.InstallMixin(ctx, j.outputFile)
 		}
-		j.installFile = ctx.InstallFile(android.PathForModuleInstall(ctx, "framework"),
+		hostDexNeeded := Bool(j.deviceProperties.Hostdex) && !ctx.Host()
-			j.Stem()+".jar", j.outputFile, extraInstallDeps...)
+		if hostDexNeeded {
+			ctx.InstallFile(android.PathForHostDexInstall(ctx, "framework"),
+				j.Stem()+"-hostdex.jar", j.outputFile)
+		}
+		var installDir android.InstallPath
+		if ctx.InstallInTestcases() {
+			var archDir string
+			if !ctx.Host() {
+				archDir = ctx.DeviceConfig().DeviceArch()
+			}
+			installDir = android.PathForModuleInstall(ctx, ctx.ModuleName(), archDir)
+		} else {
+			installDir = android.PathForModuleInstall(ctx, "framework")
+		}
+		j.installFile = ctx.InstallFile(installDir, j.Stem()+".jar", j.outputFile, extraInstallDeps...)
 	}
 }
 
@@ -1376,8 +1390,17 @@ func (j *Import) GenerateAndroidBuildActions(ctx android.ModuleContext) {
 	})
 
 	if Bool(j.properties.Installable) {
-		ctx.InstallFile(android.PathForModuleInstall(ctx, "framework"),
+		var installDir android.InstallPath
-			jarName, outputFile)
+		if ctx.InstallInTestcases() {
+			var archDir string
+			if !ctx.Host() {
+				archDir = ctx.DeviceConfig().DeviceArch()
+			}
+			installDir = android.PathForModuleInstall(ctx, ctx.ModuleName(), archDir)
+		} else {
+			installDir = android.PathForModuleInstall(ctx, "framework")
+		}
+		ctx.InstallFile(installDir, jarName, outputFile)
 	}
 
 	j.exportAidlIncludeDirs = android.PathsForModuleSrc(ctx, j.properties.Aidl.Export_include_dirs)