Merge "LOCAL_SDK_VERSION is not emitted for recovery variant"

am: f3c251c5de

Change-Id: I33be9c99077e1ca2903e3dbda5860c1e90799e7d
This commit is contained in:
Jiyong Park
2018-05-29 21:18:47 -07:00
committed by android-build-merger

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 {