ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
am: 4176b3b0cf

Change-Id: I70f18491eba593cca57d4500b7dc496e687feb0b
This commit is contained in:
Dan Willemsen 2016-07-23 00:34:29 +00:00 • committed by android-build-merger
commit 5d149b2b4a
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libcrypto_utils/Android.mk
View file

@ -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)

2
libcrypto_utils/tests/Android.mk
View file

@ -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)