From 6b44acaadb3f6b8b6b36d368695d3c7784984bf3 Mon Sep 17 00:00:00 2001
From: Nikita Ioffe <ioffe@google.com>
Date: Wed, 11 May 2022 10:44:29 +0000
Subject: [PATCH] Add apex_available platform to CtsShimPrivUpgrade

This fixes the CTS shim build. While it's not a perfect solution
(CtsShimPrivUpgrade shouldn't be available to platform), it's easy and
works and doens't introduce any risks - if a device product starts to
include CtsShimPrivUpgrade in their system image, they will fail the CTS
tests.

We can look into a proper solution in U timeframe when we have more
time.

Bug: 230724040
Test: vendor/google/cts/shim/build_all_shim.sh
Change-Id: Icf71e9d8a7b8c7983f19fbf8667ead669e662b5b
---
 packages/CtsShim/build/Android.bp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/CtsShim/build/Android.bp b/packages/CtsShim/build/Android.bp
index 7cf5385bd841c..af3e2102e4300 100644
--- a/packages/CtsShim/build/Android.bp
+++ b/packages/CtsShim/build/Android.bp
@@ -47,6 +47,7 @@ android_app {
     uses_libs: ["android.test.runner"],
 
     apex_available: [
+        "//apex_available:platform",
         "com.android.apex.cts.shim.v2_apk_in_apex_upgrades",
     ],
 }