From 35f744966b71611a1503c9ec5496ff8be865f8c9 Mon Sep 17 00:00:00 2001
From: Neil Fuller <nfuller@google.com>
Date: Thu, 12 Jul 2018 19:47:21 +0100
Subject: [PATCH] Make host targets use non-repackaged targets

A host build target was depending on a target that is intended for
on-device, repackaged (com.android.) use. This switches to using the
unbundled target instead.

Test: Build
Bug: 111055375
Bug: 111734251
Change-Id: Ie81dd7257a14756fc21fa6f956175e5bd2ff80c1
---
 tools/signapk/Android.bp | 4 ++--
 tools/signtos/Android.bp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/signapk/Android.bp b/tools/signapk/Android.bp
index 4954cf5744..ee4cfaba29 100644
--- a/tools/signapk/Android.bp
+++ b/tools/signapk/Android.bp
@@ -22,8 +22,8 @@ java_library_host {
     manifest: "SignApk.mf",
     static_libs: [
         "apksig",
-        "bouncycastle",
-        "bouncycastle-bcpkix",
+        "bouncycastle-unbundled",
+        "bouncycastle-bcpkix-unbundled",
         "conscrypt",
     ],
 
diff --git a/tools/signtos/Android.bp b/tools/signtos/Android.bp
index b26631f1e8..688e7b8e71 100644
--- a/tools/signtos/Android.bp
+++ b/tools/signtos/Android.bp
@@ -21,7 +21,7 @@ java_library_host {
     srcs: ["SignTos.java"],
     manifest: "SignTos.mf",
     static_libs: [
-        "bouncycastle",
-        "bouncycastle-bcpkix",
+        "bouncycastle-unbundled",
+        "bouncycastle-bcpkix-unbundled",
     ],
 }