commit b74d1e1d913ffdc883121c962eb5ca661196e460
author Spandan Das <spandandas@google.com> Tue Mar 21 01:36:46 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 21 01:36:47 2023 +0000
tree 192889f627b363e01a20539ec4ba22f04316138e
parent e773739787394e9632043749e88ca6cfd5a40a67

Revert "Update min_sdk_version from SdkSpec to ApiLevel"

Revert submission 2457063

Reason for revert: Broken udc-dev

Reverted changes: /q/submissionid:2457063

Change-Id: Id6349fc1318877044af713c914a0afd437d3d2d5

java/rro.go

diff --git a/java/rro.go b/java/rro.go
index 49737b9..9d0667c 100644
--- a/java/rro.go
+++ b/java/rro.go
@@ -175,11 +175,11 @@
 	return ""
 }
 
-func (r *RuntimeResourceOverlay) MinSdkVersion(ctx android.EarlyModuleContext) android.ApiLevel {
+func (r *RuntimeResourceOverlay) MinSdkVersion(ctx android.EarlyModuleContext) android.SdkSpec {
 	if r.properties.Min_sdk_version != nil {
-		return android.ApiLevelFrom(ctx, *r.properties.Min_sdk_version)
+		return android.SdkSpecFrom(ctx, *r.properties.Min_sdk_version)
 	}
-	return r.SdkVersion(ctx).ApiLevel
+	return r.SdkVersion(ctx)
 }
 
 func (r *RuntimeResourceOverlay) ReplaceMaxSdkVersionPlaceholder(ctx android.EarlyModuleContext) android.SdkSpec {