From c9c5e4b969de3f1ea4b6df1ffc06b8468641e051 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Thu, 21 Jul 2016 14:15:31 -0700 Subject: [PATCH] Rename lib{crypto,ssl}-host to lib{crypto,ssl} There's no need to use a different name for target and host moudles. In Soong, it's better to use the same for both, as target and host modules can be defined at the same time. Change-Id: I32ee5bbd54b16a4ed9d812db4da836e96b1e8654 --- libcrypto_utils/Android.mk | 4 ++-- libcrypto_utils/tests/Android.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libcrypto_utils/Android.mk b/libcrypto_utils/Android.mk index 5e9763fe5..b6d220443 100644 --- a/libcrypto_utils/Android.mk +++ b/libcrypto_utils/Android.mk @@ -31,7 +31,7 @@ LOCAL_SRC_FILES := android_pubkey.c LOCAL_CFLAGS := -Wall -Werror -Wextra -std=c99 LOCAL_C_INCLUDES := $(LOCAL_PATH)/include LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include -LOCAL_SHARED_LIBRARIES := libcrypto-host +LOCAL_SHARED_LIBRARIES := libcrypto include $(BUILD_HOST_SHARED_LIBRARY) include $(CLEAR_VARS) @@ -40,7 +40,7 @@ LOCAL_SRC_FILES := android_pubkey.c LOCAL_CFLAGS := -Wall -Werror -Wextra -std=c99 LOCAL_C_INCLUDES := $(LOCAL_PATH)/include LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include -LOCAL_STATIC_LIBRARIES := libcrypto_static +LOCAL_STATIC_LIBRARIES := libcrypto include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) diff --git a/libcrypto_utils/tests/Android.mk b/libcrypto_utils/tests/Android.mk index dad82f70f..bdaef71f2 100644 --- a/libcrypto_utils/tests/Android.mk +++ b/libcrypto_utils/tests/Android.mk @@ -20,5 +20,5 @@ include $(CLEAR_VARS) LOCAL_MODULE := libcrypto_utils_test LOCAL_SRC_FILES := android_pubkey_test.cpp LOCAL_CFLAGS := -Wall -Werror -Wextra -std=c++11 -LOCAL_SHARED_LIBRARIES := libcrypto_utils libcrypto-host +LOCAL_SHARED_LIBRARIES := libcrypto_utils libcrypto include $(BUILD_HOST_NATIVE_TEST)