summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn Willden <swillden@google.com>2015-09-24 09:31:16 -0600
committerShawn Willden <swillden@google.com>2015-09-24 13:01:14 -0600
commite6e2f6658a6fe97eaa0afda2881f928a0227720c (patch)
tree9146b1c952a3ad98c8f9d85179934f836e80ad96
parente748085f5ee441a2c0a1380e9da824fd07877873 (diff)
downloadandroid_system_keymaster-e6e2f6658a6fe97eaa0afda2881f928a0227720c.tar.gz
android_system_keymaster-e6e2f6658a6fe97eaa0afda2881f928a0227720c.tar.bz2
android_system_keymaster-e6e2f6658a6fe97eaa0afda2881f928a0227720c.zip
Add a faux library libkeymasterfiles to export source.
The library contains nothing, but it exports everything in keymaster as an include file, enabling it to be #included in other projects. This is to make it easy to build keymaster for TLK. Bug: 24372377 Change-Id: I0f9fd30e2feb1d89a8ff199567ce1ec6b037e236
-rw-r--r--Android.mk14
1 files changed, 13 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index 8aba49a..5a6dbb4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -76,7 +76,7 @@ LOCAL_C_INCLUDES := \
LOCAL_SHARED_LIBRARIES := libcrypto libkeymaster_messages
LOCAL_CFLAGS = -Wall -Werror -Wunused
LOCAL_CLANG_CFLAGS += -Wno-error=unused-const-variable -Wno-error=unused-private-field
-# Ignore benigh warnings for now.
+# Ignore benign warnings for now.
LOCAL_CLANG_CFLAGS += -Wno-error=unused-private-field
LOCAL_MODULE_TAGS := optional
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
@@ -114,6 +114,18 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
include $(BUILD_SHARED_LIBRARY)
+###
+# libkeymasterfiles is an empty library that exports all of the files in keymaster as includes.
+###
+include $(CLEAR_VARS)
+LOCAL_MODULE := libkeymasterfiles
+LOCAL_EXPORT_C_INCLUDE_DIRS := \
+ $(LOCAL_PATH) \
+ $(LOCAL_PATH)/include
+LOCAL_MODULE_TAGS := optional
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
+include $(BUILD_STATIC_LIBRARY)
+
# Unit tests for libkeymaster
include $(CLEAR_VARS)
LOCAL_MODULE := keymaster_tests