commit f4f94ab56747c707355bbebffd95f8b405e5e1d6
author Treehugger Robot <treehugger-gerrit@google.com> Wed Oct 18 09:41:11 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 18 09:41:11 2017 +0000
tree 8cc3d2f890ef95bac4d55a02c7ca6576b5795076
parent e02a37d0466d101d345421542cdeeea431415ec4
parent b34d45ad65524e3cd1d9b77963b8dc25beced5c2

Merge "Follow renames of conscrypt and bouncycastle to remove -host suffix"

tools/signapk/Android.mk

diff --git a/tools/signapk/Android.mk b/tools/signapk/Android.mk
index 051a51d..8082842 100644
--- a/tools/signapk/Android.mk
+++ b/tools/signapk/Android.mk
@@ -23,9 +23,9 @@
 LOCAL_JAR_MANIFEST := SignApk.mf
 LOCAL_STATIC_JAVA_LIBRARIES := \
     apksig \
-    bouncycastle-host \
-    bouncycastle-bcpkix-host \
-    conscrypt-host
+    bouncycastle \
+    bouncycastle-bcpkix \
+    conscrypt
 LOCAL_REQUIRED_MODULES := libconscrypt_openjdk_jni
 include $(BUILD_HOST_JAVA_LIBRARY)
 

tools/signtos/Android.mk

diff --git a/tools/signtos/Android.mk b/tools/signtos/Android.mk
index 94ab944..3e869b3 100644
--- a/tools/signtos/Android.mk
+++ b/tools/signtos/Android.mk
@@ -21,5 +21,5 @@
 LOCAL_MODULE := signtos
 LOCAL_SRC_FILES := SignTos.java
 LOCAL_JAR_MANIFEST := SignTos.mf
-LOCAL_STATIC_JAVA_LIBRARIES := bouncycastle-host bouncycastle-bcpkix-host
+LOCAL_STATIC_JAVA_LIBRARIES := bouncycastle bouncycastle-bcpkix
 include $(BUILD_HOST_JAVA_LIBRARY)