From 7f88a03f88b7c07ab1cdd46f414823de15fc4506 Mon Sep 17 00:00:00 2001
From: Spandan Das <spandandas@google.com>
Date: Tue, 21 Mar 2023 01:36:46 +0000
Subject: [PATCH] Revert "Prework for migrating min_sdk_version from
 (kind+level) ..."

Revert submission 2457063

Reason for revert: Broken udc-dev

Reverted changes: /q/submissionid:2457063

Change-Id: Ia17c962b9506c2bc9eaffdb34e99fc2082d42721
---
 sdk/bootclasspath_fragment_sdk_test.go | 1 -
 sdk/update.go                          | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/sdk/bootclasspath_fragment_sdk_test.go b/sdk/bootclasspath_fragment_sdk_test.go
index 0d6496dd3..efb97be37 100644
--- a/sdk/bootclasspath_fragment_sdk_test.go
+++ b/sdk/bootclasspath_fragment_sdk_test.go
@@ -839,7 +839,6 @@ func TestSnapshotWithBootclasspathFragment_HiddenAPI(t *testing.T) {
 				compile_dex: true,
 				public: {enabled: true},
 				permitted_packages: ["mysdklibrary"],
-				min_sdk_version: "current",
 			}
 
 			java_sdk_library {
diff --git a/sdk/update.go b/sdk/update.go
index bed7f5254..0820d62b8 100644
--- a/sdk/update.go
+++ b/sdk/update.go
@@ -319,7 +319,7 @@ func (s *sdk) buildSnapshot(ctx android.ModuleContext, sdkVariants []*sdk) {
 	targetBuildRelease := s.targetBuildRelease(ctx)
 	targetApiLevel, err := android.ApiLevelFromUser(ctx, targetBuildRelease.name)
 	if err != nil {
-		targetApiLevel = android.InvalidApiLevel
+		targetApiLevel = android.FutureApiLevel
 	}
 
 	// Aggregate all the sdkMemberVariantDep instances from all the sdk variants.