Merge "dex_import that isn't available for platform isn't installed"

2020-06-09 23:02:10 +00:00
parent bf488e10e8 01bca755ae
commit d4873a6b68
1 changed files with 4 additions and 2 deletions
--- a/java/java.go
+++ b/java/java.go
@@ -2754,8 +2754,10 @@ func (j *DexImport) GenerateAndroidBuildActions(ctx android.ModuleContext) {

 	j.maybeStrippedDexJarFile = dexOutputFile

-	ctx.InstallFile(android.PathForModuleInstall(ctx, "framework"),
-		j.Stem()+".jar", dexOutputFile)
+	if j.IsForPlatform() {
+		ctx.InstallFile(android.PathForModuleInstall(ctx, "framework"),
+			j.Stem()+".jar", dexOutputFile)
+	}
 }

 func (j *DexImport) DexJarBuildPath() android.Path {