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

apex/apex.go

diff --git a/apex/apex.go b/apex/apex.go
index 9e9d742..b2ca6c4 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -2946,8 +2946,12 @@
 }
 
 // Returns apex's min_sdk_version SdkSpec, honoring overrides
-func (a *apexBundle) MinSdkVersion(ctx android.EarlyModuleContext) android.ApiLevel {
-	return a.minSdkVersion(ctx)
+func (a *apexBundle) MinSdkVersion(ctx android.EarlyModuleContext) android.SdkSpec {
+	return android.SdkSpec{
+		Kind:     android.SdkNone,
+		ApiLevel: a.minSdkVersion(ctx),
+		Raw:      a.minSdkVersionValue(ctx),
+	}
 }
 
 // Returns apex's min_sdk_version ApiLevel, honoring overrides