commit f3c251c5de419da7d20b83f9fe0d689123ff7686
author Treehugger Robot <treehugger-gerrit@google.com> Wed May 30 03:29:51 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 30 03:29:51 2018 +0000
tree 746d52ae1b0990f341aa35542a6290b012a6fa67
parent 9c753911683b20fc8e8b1aadebf1b95a2f3bbdaf
parent 97686288dd17c9bc74feb64b8c250fdf96495cf1

Merge "LOCAL_SDK_VERSION is not emitted for recovery variant"

cc/androidmk.go

diff --git a/cc/androidmk.go b/cc/androidmk.go
index f417de0..263f0f3 100644
--- a/cc/androidmk.go
+++ b/cc/androidmk.go
@@ -71,7 +71,7 @@
 					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 {