Merge \\\"Rename lib{crypto,ssl}-host to lib{crypto,ssl}\\\" am: 00a4ee0f46
am: 4176b3b0cf
am: 5d149b2b4a
Change-Id: I32bc8899a07937a1d2df4505b2def83d347fa952
This commit is contained in:
commit
d2d1a6faae
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue