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

Commit 94ddb28a 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" 

am: f4f94ab5

Change-Id: I9c978fb748ec3ce15cc9ea238193606a4726ae8f
parents 42ba61ca f4f94ab5

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)