Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee0dcd82 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

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

Merge "Follow renames of conscrypt and bouncycastle to remove -host suffix" am: f4f94ab5 am: 94ddb28a
am: 4d5c09aa

Change-Id: I5124abc4f48bea0931a75a9eef2133411e809a7b
parents 95344228 4d5c09aa

tools/signapk/Android.mk

+3 −3
Original line number Diff line number Diff line
@@ -23,9 +23,9 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) 
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

+1 −1
Original line number Diff line number Diff line
@@ -21,5 +21,5 @@ include $(CLEAR_VARS) 
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)