diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-07-10 00:16:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-07-10 00:16:29 +0000 |
| commit | ad234e489411a1846ec72396174bb938dd553c76 (patch) | |
| tree | 3f299b382e02d4aebc9621e84c82d8b3fbe54aca /java/androidmk.go | |
| parent | aa070b422e5148b61cd146c40f6224822e11935c (diff) | |
| parent | cf53e608a7f2cc9cd422f13fb096b9ff1e2c74de (diff) | |
| download | build_soong-ad234e489411a1846ec72396174bb938dd553c76.tar.gz build_soong-ad234e489411a1846ec72396174bb938dd553c76.tar.bz2 build_soong-ad234e489411a1846ec72396174bb938dd553c76.zip | |
Merge changes Ieaf37ba6,Ic69f1f93
* changes:
pom2bp: extract minSdkVersion from manifest into Android.bp
Add support for min_sdk_version
Diffstat (limited to 'java/androidmk.go')
| -rw-r--r-- | java/androidmk.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/androidmk.go b/java/androidmk.go index d6095ae0..79cf3175 100644 --- a/java/androidmk.go +++ b/java/androidmk.go @@ -56,7 +56,7 @@ func (library *Library) AndroidMk() android.AndroidMkData { fmt.Fprintln(w, "LOCAL_DEX_PREOPT_PROFILE_CLASS_LISTING := $(LOCAL_PATH)/"+*library.deviceProperties.Dex_preopt.Profile) } } - fmt.Fprintln(w, "LOCAL_SDK_VERSION :=", String(library.deviceProperties.Sdk_version)) + fmt.Fprintln(w, "LOCAL_SDK_VERSION :=", library.sdkVersion()) fmt.Fprintln(w, "LOCAL_SOONG_HEADER_JAR :=", library.headerJarFile.String()) if library.jacocoReportClassesFile != nil { @@ -121,7 +121,7 @@ func (prebuilt *Import) AndroidMk() android.AndroidMkData { func(w io.Writer, outputFile android.Path) { fmt.Fprintln(w, "LOCAL_UNINSTALLABLE_MODULE := ", !Bool(prebuilt.properties.Installable)) fmt.Fprintln(w, "LOCAL_SOONG_HEADER_JAR :=", prebuilt.combinedClasspathFile.String()) - fmt.Fprintln(w, "LOCAL_SDK_VERSION :=", String(prebuilt.properties.Sdk_version)) + fmt.Fprintln(w, "LOCAL_SDK_VERSION :=", prebuilt.sdkVersion()) }, }, } @@ -141,7 +141,7 @@ func (prebuilt *AARImport) AndroidMk() android.AndroidMkData { fmt.Fprintln(w, "LOCAL_SOONG_EXPORT_PROGUARD_FLAGS :=", prebuilt.proguardFlags.String()) fmt.Fprintln(w, "LOCAL_SOONG_STATIC_LIBRARY_EXTRA_PACKAGES :=", prebuilt.extraAaptPackagesFile.String()) fmt.Fprintln(w, "LOCAL_FULL_MANIFEST_FILE :=", prebuilt.manifest.String()) - fmt.Fprintln(w, "LOCAL_SDK_VERSION :=", String(prebuilt.properties.Sdk_version)) + fmt.Fprintln(w, "LOCAL_SDK_VERSION :=", prebuilt.sdkVersion()) }, }, } |