commit c8060536e85af0a1904f0ff87a8b4ab420b67639
author Dan Albert <danalbert@google.com> Wed Jul 22 22:32:17 2020 -0700
committer Dan Albert <danalbert@google.com> Tue Sep 22 15:04:48 2020 -0700
tree 807959d83da6c9ed5b1e0cb5ff48d1b5e76e1b03
parent af6073f78da822b91ef3c8bbd3f52b498003b633

Replace ApiStrToNum uses with ApiLevel.

Test: treehugger
Bug: http://b/154667674
Change-Id: I2954bb21c1cfdeb305f25cfb6c8711c930f6ed50

cc/compiler.go

diff --git a/cc/compiler.go b/cc/compiler.go
index f745820..18a2f62 100644
--- a/cc/compiler.go
+++ b/cc/compiler.go
@@ -354,7 +354,9 @@
 			flags.Global.CommonFlags = append(flags.Global.CommonFlags, "-D__ANDROID_APEX_NAME__='\""+ctx.apexVariationName()+"\"'")
 		}
 		if ctx.Device() {
-			flags.Global.CommonFlags = append(flags.Global.CommonFlags, "-D__ANDROID_SDK_VERSION__="+strconv.Itoa(ctx.apexSdkVersion()))
+			flags.Global.CommonFlags = append(flags.Global.CommonFlags,
+				fmt.Sprintf("-D__ANDROID_SDK_VERSION__=%d",
+					ctx.apexSdkVersion().FinalOrFutureInt()))
 		}
 	}