From b34d45ad65524e3cd1d9b77963b8dc25beced5c2 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 17 Oct 2017 15:27:52 -0700 Subject: [PATCH] Follow renames of conscrypt and bouncycastle to remove -host suffix Test: m checkbuild Change-Id: I72bd7249cf6bdc4a2251f6877c776f439649da81 --- tools/signapk/Android.mk | 6 +++--- tools/signtos/Android.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/signapk/Android.mk b/tools/signapk/Android.mk index 051a51d079..8082842e6f 100644 --- a/tools/signapk/Android.mk +++ b/tools/signapk/Android.mk @@ -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) diff --git a/tools/signtos/Android.mk b/tools/signtos/Android.mk index 94ab94443b..3e869b38ee 100644 --- a/tools/signtos/Android.mk +++ b/tools/signtos/Android.mk @@ -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)