From cfb43cae24a85ae09ceb94602e5b4917efa3478e Mon Sep 17 00:00:00 2001
From: Vinh Tran <vinhdaitran@google.com>
Date: Tue, 3 May 2022 00:38:05 +0000
Subject: [PATCH] Revert "Remove sdk_version if platform_apis is set"

This reverts commit 160172d92d83338bd80c4996c0237ca866bc20ae.

Reason for revert: Should have removed platform_apis instead because
removing platform_apis doesn't change the module deps (done in aosp/2085943)

Test: CI
Bug: 219755537
Change-Id: I9657e569d942bf845c79352a042553c6fc6b0fd3
---
 core/tests/PackageInstallerSessions/Android.bp                   | 1 +
 core/tests/bugreports/Android.bp                                 | 1 +
 core/tests/coretests/Android.bp                                  | 1 +
 .../host/test-apps/DeviceSide/Android.bp                         | 1 +
 4 files changed, 4 insertions(+)

diff --git a/core/tests/PackageInstallerSessions/Android.bp b/core/tests/PackageInstallerSessions/Android.bp
index de2a013df9996..c112cbb47b551 100644
--- a/core/tests/PackageInstallerSessions/Android.bp
+++ b/core/tests/PackageInstallerSessions/Android.bp
@@ -51,5 +51,6 @@ android_test {
     ],
 
     platform_apis: true,
+    sdk_version: "core_platform",
     test_suites: ["device-tests"],
 }
diff --git a/core/tests/bugreports/Android.bp b/core/tests/bugreports/Android.bp
index 43a96793447da..f87797a90c904 100644
--- a/core/tests/bugreports/Android.bp
+++ b/core/tests/bugreports/Android.bp
@@ -35,6 +35,7 @@ android_test {
         "truth-prebuilt",
     ],
     test_suites: ["general-tests"],
+    sdk_version: "test_current",
     platform_apis: true,
 }
 
diff --git a/core/tests/coretests/Android.bp b/core/tests/coretests/Android.bp
index b52118425a2dc..05ec00fe84f08 100644
--- a/core/tests/coretests/Android.bp
+++ b/core/tests/coretests/Android.bp
@@ -73,6 +73,7 @@ android_test {
     ],
 
     platform_apis: true,
+    sdk_version: "core_platform",
     test_suites: ["device-tests"],
 
     certificate: "platform",
diff --git a/services/tests/PackageManagerServiceTests/host/test-apps/DeviceSide/Android.bp b/services/tests/PackageManagerServiceTests/host/test-apps/DeviceSide/Android.bp
index 0a033380e6c91..7e4f0e72b62d0 100644
--- a/services/tests/PackageManagerServiceTests/host/test-apps/DeviceSide/Android.bp
+++ b/services/tests/PackageManagerServiceTests/host/test-apps/DeviceSide/Android.bp
@@ -25,6 +25,7 @@ package {
 
 android_test_helper_app {
     name: "PackageManagerServiceDeviceSideTests",
+    sdk_version: "test_current",
     srcs: ["src/**/*.kt"],
     libs: [
         "android.test.base",