From 625cb76f148f39a5b8f4ee523f5ae7679077aa21 Mon Sep 17 00:00:00 2001
From: Vinh Tran <vinhdaitran@google.com>
Date: Tue, 3 May 2022 12:55:35 -0400
Subject: [PATCH] Unset platform_apis if sdk_version is already set

Unsetting platform_apis while keeping sdk_version as is does not affect
the module's deps

Test: m queryview && builozer 'print soong_module_deps' :target (to
ensure the deps aren't affected

Bug: 219755537
Change-Id: Ic0d02c5e7fec24843e4cd2541cc5106381c7180e
---
 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 deletions(-)

diff --git a/core/tests/PackageInstallerSessions/Android.bp b/core/tests/PackageInstallerSessions/Android.bp
index c112cbb47b551..6f2366e325747 100644
--- a/core/tests/PackageInstallerSessions/Android.bp
+++ b/core/tests/PackageInstallerSessions/Android.bp
@@ -50,7 +50,6 @@ android_test {
         ":PackageManagerTestAppVersion1",
     ],
 
-    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 f87797a90c904..2b34ee2646f37 100644
--- a/core/tests/bugreports/Android.bp
+++ b/core/tests/bugreports/Android.bp
@@ -36,7 +36,6 @@ android_test {
     ],
     test_suites: ["general-tests"],
     sdk_version: "test_current",
-    platform_apis: true,
 }
 
 filegroup {
diff --git a/core/tests/coretests/Android.bp b/core/tests/coretests/Android.bp
index 05ec00fe84f08..f971af1466c31 100644
--- a/core/tests/coretests/Android.bp
+++ b/core/tests/coretests/Android.bp
@@ -72,7 +72,6 @@ android_test {
         "libpowermanagertest_jni",
     ],
 
-    platform_apis: true,
     sdk_version: "core_platform",
     test_suites: ["device-tests"],
 
diff --git a/services/tests/PackageManagerServiceTests/host/test-apps/DeviceSide/Android.bp b/services/tests/PackageManagerServiceTests/host/test-apps/DeviceSide/Android.bp
index 7e4f0e72b62d0..2617f4d09ee7b 100644
--- a/services/tests/PackageManagerServiceTests/host/test-apps/DeviceSide/Android.bp
+++ b/services/tests/PackageManagerServiceTests/host/test-apps/DeviceSide/Android.bp
@@ -38,5 +38,4 @@ android_test_helper_app {
         "androidx.test.rules",
         "truth-prebuilt",
     ],
-    platform_apis: true,
 }