commit a130af98edd45c35142daeb59200e6bd6dbdb84a
author Tao Bao <tbao@google.com> Mon Aug 06 17:07:57 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Aug 06 17:07:57 2018 +0000
tree f2e0f25aba054eba70827503e111cdae4e8146eb
parent 09c81c303a2b79f081d02d0238f1092a5212a85f
parent 6eb1a99f36a77031a14711e8bb49f531862e6451

Merge "Write the missing system build props to recovery build prop file."

tools/signapk/Android.bp

diff --git a/tools/signapk/Android.bp b/tools/signapk/Android.bp
index 4954cf5..ee4cfab 100644
--- a/tools/signapk/Android.bp
+++ b/tools/signapk/Android.bp
@@ -22,8 +22,8 @@
     manifest: "SignApk.mf",
     static_libs: [
         "apksig",
-        "bouncycastle",
-        "bouncycastle-bcpkix",
+        "bouncycastle-unbundled",
+        "bouncycastle-bcpkix-unbundled",
         "conscrypt",
     ],
 

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