commit 35f744966b71611a1503c9ec5496ff8be865f8c9
author Neil Fuller <nfuller@google.com> Thu Jul 12 19:47:21 2018 +0100
committer Neil Fuller <nfuller@google.com> Mon Jul 23 13:00:32 2018 +0100
tree 081367d0e7f4081bda23bfb7a87a9d7583bb4eee
parent 901d05469edd9079a717e37f2815791006f9ca28

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/signtos/Android.bp

diff --git a/tools/signtos/Android.bp b/tools/signtos/Android.bp
index b26631f..688e7b8 100644
--- a/tools/signtos/Android.bp
+++ b/tools/signtos/Android.bp
@@ -21,7 +21,7 @@
     srcs: ["SignTos.java"],
     manifest: "SignTos.mf",
     static_libs: [
-        "bouncycastle",
-        "bouncycastle-bcpkix",
+        "bouncycastle-unbundled",
+        "bouncycastle-bcpkix-unbundled",
     ],
 }