diff options
| author | Shawn Willden <swillden@google.com> | 2015-03-11 12:36:40 -0600 |
|---|---|---|
| committer | Shawn Willden <swillden@google.com> | 2015-03-12 07:39:29 -0600 |
| commit | fdd6a6f5e60b8d0b513ffed84ca59b4b6ffef19c (patch) | |
| tree | 051ff10558f5aca5dae96605a63164b27cd40f41 /Android.mk | |
| parent | 2c242009007a38b5c8003137fb8ba5a1fdb73b70 (diff) | |
| download | android_system_keymaster-fdd6a6f5e60b8d0b513ffed84ca59b4b6ffef19c.tar.gz android_system_keymaster-fdd6a6f5e60b8d0b513ffed84ca59b4b6ffef19c.tar.bz2 android_system_keymaster-fdd6a6f5e60b8d0b513ffed84ca59b4b6ffef19c.zip | |
Rename libkeymaster to avoid collision with fugu libkeymaster.
Change-Id: Id9547b73d0519517b328e31d45e9d96ba9155c39
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -35,13 +35,13 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_SHARED_LIBRARY) ### -# libkeymaster contains almost everything needed for a keymaster implementation, -# lacking only a subclass of the (abstract) GoogleKeymaster class to provide -# environment-specific services and a wrapper to translate from the -# function-based keymaster HAL API to the message-based GoogleKeymaster API. +# libkeymaster1 contains almost everything needed for a keymaster1 +# implementation, lacking only a subclass of the (abstract) GoogleKeymaster +# class to provide environment-specific services and a wrapper to translate from +# the function-based keymaster HAL API to the message-based GoogleKeymaster API. ### include $(CLEAR_VARS) -LOCAL_MODULE:= libkeymaster +LOCAL_MODULE:= libkeymaster1 LOCAL_SRC_FILES:= \ aead_mode_operation.cpp \ aes_key.cpp \ @@ -94,7 +94,7 @@ LOCAL_C_INCLUDES := \ LOCAL_CFLAGS = -Wall -Werror # Ignore benigh warnings for now. LOCAL_CLANG_CFLAGS += -Wno-error=unused-const-variable -LOCAL_SHARED_LIBRARIES := libkeymaster liblog libcrypto +LOCAL_SHARED_LIBRARIES := libkeymaster1 liblog libcrypto LOCAL_MODULE_TAGS := optional LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include |