diff --git a/java/androidmk.go b/java/androidmk.go index c61b7e56a..d3aadef3d 100644 --- a/java/androidmk.go +++ b/java/androidmk.go @@ -74,7 +74,7 @@ func (prebuilt *Import) AndroidMk() android.AndroidMkData { Include: "$(BUILD_SYSTEM)/soong_java_prebuilt.mk", Extra: []android.AndroidMkExtraFunc{ func(w io.Writer, outputFile android.Path) { - fmt.Fprintln(w, "LOCAL_UNINSTALLABLE_MODULE := true") + fmt.Fprintln(w, "LOCAL_UNINSTALLABLE_MODULE := ", !proptools.Bool(prebuilt.properties.Installable)) fmt.Fprintln(w, "LOCAL_SOONG_HEADER_JAR :=", prebuilt.combinedClasspathFile.String()) fmt.Fprintln(w, "LOCAL_SDK_VERSION :=", prebuilt.properties.Sdk_version) }, diff --git a/java/java.go b/java/java.go index 497b28510..fbd7bdd8b 100644 --- a/java/java.go +++ b/java/java.go @@ -920,6 +920,8 @@ type ImportProperties struct { Jars []string Sdk_version string + + Installable *bool } type Import struct {