Merge "Make host targets use non-repackaged targets"

2018-08-05 15:05:48 +00:00
parent a0d3277b8d 35f744966b
commit 09c81c303a
2 changed files with 4 additions and 4 deletions
--- 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",
    ],

--- 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",
    ],
 }