diff options
| author | Colin Cross <ccross@android.com> | 2017-10-20 17:57:49 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2017-10-20 20:14:47 -0700 |
| commit | 535e2cf4e1aa7b942e4662f6073517df0c00d09e (patch) | |
| tree | e8d61906594b6fc13af2f6c1dea54f0926ab359a /java | |
| parent | 2ebc47664648985a2f1fd4814ff19122148c6f85 (diff) | |
| download | android_build_soong-535e2cf4e1aa7b942e4662f6073517df0c00d09e.tar.gz android_build_soong-535e2cf4e1aa7b942e4662f6073517df0c00d09e.tar.bz2 android_build_soong-535e2cf4e1aa7b942e4662f6073517df0c00d09e.zip | |
Support installable prebuilt jars
Some host modules need to be installed. Add an installable property.
Test: m checkbuild
Change-Id: Ifd023213ff66e81aa77ba1741c75837a1dd88d1d
Diffstat (limited to 'java')
| -rw-r--r-- | java/androidmk.go | 2 | ||||
| -rw-r--r-- | java/java.go | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/java/androidmk.go b/java/androidmk.go index c61b7e56..d3aadef3 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 497b2851..fbd7bdd8 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 { |