From 461bd1aae748ebf4097d153b066bd533f76ad5d6 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Fri, 20 Oct 2017 13:59:18 -0700 Subject: [PATCH] Add sdk_version property to imported jars Test: m checkbuild Change-Id: I83dd6ad157c7a5918747ce8c9be05c1e1e22d710 --- java/androidmk.go | 1 + java/java.go | 2 ++ 2 files changed, 3 insertions(+) diff --git a/java/androidmk.go b/java/androidmk.go index e7f79d24d..c61b7e56a 100644 --- a/java/androidmk.go +++ b/java/androidmk.go @@ -76,6 +76,7 @@ func (prebuilt *Import) AndroidMk() android.AndroidMkData { func(w io.Writer, outputFile android.Path) { fmt.Fprintln(w, "LOCAL_UNINSTALLABLE_MODULE := true") 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 0cd99ebf9..7fdf94eba 100644 --- a/java/java.go +++ b/java/java.go @@ -913,6 +913,8 @@ func BinaryHostFactory() android.Module { type ImportProperties struct { Jars []string + + Sdk_version string } type Import struct {