p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Follow renames of conscrypt and bouncycastle to remove -host suffix" am: f4f94ab567 am: 94ddb28a26 

am: 4d5c09aad9

Change-Id: I5124abc4f48bea0931a75a9eef2133411e809a7b
This commit is contained in:
Colin Cross 2017-10-18 11:57:46 +00:00 committed by android-build-merger
parent 953442280d 4d5c09aad9
commit ee0dcd825e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/signapk/Android.mk
View File

@ -23,9 +23,9 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_JAR_MANIFEST := SignApk.mf LOCAL_JAR_MANIFEST := SignApk.mf
LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_STATIC_JAVA_LIBRARIES := \
apksig \ apksig \
bouncycastle-host \ bouncycastle \
bouncycastle-bcpkix-host \ bouncycastle-bcpkix \
conscrypt-host conscrypt
LOCAL_REQUIRED_MODULES := libconscrypt_openjdk_jni LOCAL_REQUIRED_MODULES := libconscrypt_openjdk_jni
include $(BUILD_HOST_JAVA_LIBRARY) include $(BUILD_HOST_JAVA_LIBRARY)

2
tools/signtos/Android.mk
View File

@ -21,5 +21,5 @@ include $(CLEAR_VARS)
LOCAL_MODULE := signtos LOCAL_MODULE := signtos
LOCAL_SRC_FILES := SignTos.java LOCAL_SRC_FILES := SignTos.java
LOCAL_JAR_MANIFEST := SignTos.mf 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) include $(BUILD_HOST_JAVA_LIBRARY)