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

Commit 5d149b2b authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge \\"Rename lib{crypto,ssl}-host to lib{crypto,ssl}\\" am: 00a4ee0f 

am: 4176b3b0

Change-Id: I70f18491eba593cca57d4500b7dc496e687feb0b
parents 7549a460 4176b3b0

libcrypto_utils/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -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)

libcrypto_utils/tests/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -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)