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

java/androidmk.go

@@ -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

@@ -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)