From 198edb4c97eee0de32d7b5826c18fcb04dbf5798 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Wed, 8 Apr 2020 15:57:57 -0700
Subject: [PATCH] Make derive_sdk_prefer32 uninstallable

Fix TARGET_BUILD_APPS builds by marking derive_sdk_prefer32
uninstallable so it doesn't try to create a rule to install to
the same path as derive_sdk.

Fixes: 153602595
Test: m TARGET_BUILD_APPS=foo nothing
Test: m test_com.android.sdkext &&
      deapexer list out/target/product/vsoc_x86/obj/ETC/test_com.android.sdkext_intermediates/test_com.android.sdkext.apex
Change-Id: I02bcbc0cbfef6ef66a79ad2ccd73c8af101b67de
---
 apex/sdkextensions/derive_sdk/Android.bp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apex/sdkextensions/derive_sdk/Android.bp b/apex/sdkextensions/derive_sdk/Android.bp
index 6e21581f94ee5..c419b51c9b9b9 100644
--- a/apex/sdkextensions/derive_sdk/Android.bp
+++ b/apex/sdkextensions/derive_sdk/Android.bp
@@ -45,7 +45,8 @@ cc_binary {
     compile_multilib: "prefer32",
     stem: "derive_sdk",
     apex_available: [ "test_com.android.sdkext" ],
-    visibility: [ "//frameworks/base/apex/sdkextensions/testing" ]
+    visibility: [ "//frameworks/base/apex/sdkextensions/testing" ],
+    installable: false,
 }
 
 prebuilt_etc {