Merge "LOCAL_SDK_VERSION is not emitted for recovery variant"

This commit is contained in:
Treehugger Robot
2018-05-30 03:29:51 +00:00
committed by Gerrit Code Review

View File

@@ -71,7 +71,7 @@ func (c *Module) AndroidMk() android.AndroidMkData {
fmt.Fprintln(w, "LOCAL_SHARED_LIBRARIES := "+strings.Join(c.Properties.AndroidMkSharedLibs, " "))
}
if c.Target().Os == android.Android &&
String(c.Properties.Sdk_version) != "" && !c.useVndk() {
String(c.Properties.Sdk_version) != "" && !c.useVndk() && !c.inRecovery() {
fmt.Fprintln(w, "LOCAL_SDK_VERSION := "+String(c.Properties.Sdk_version))
fmt.Fprintln(w, "LOCAL_NDK_STL_VARIANT := none")
} else {