android: Fix build after adding libtpmtss

strongswan · Jun 28, 2016 · 6b726b6 · 6b726b6
1 parent 6a24637
commit 6b726b6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/Android.mk b/Android.mk
@@ -96,7 +96,8 @@ strongswan_BUILD := \
 	libstrongswan \
 	libtncif \
 	libtnccs \
-	libimcv
+	libimcv \
+	libtpmtss
 
 ifneq ($(strongswan_BUILD_STARTER),)
 strongswan_BUILD += \

diff --git a/src/frontends/android/app/src/main/jni/Android.mk b/src/frontends/android/app/src/main/jni/Android.mk
@@ -77,7 +77,8 @@ ifneq ($(strongswan_USE_BYOD),)
 strongswan_BUILD += \
 	$(strongswan_DIR)/src/libtnccs \
 	$(strongswan_DIR)/src/libtncif \
-	$(strongswan_DIR)/src/libimcv
+	$(strongswan_DIR)/src/libimcv \
+	$(strongswan_DIR)/src/libtpmtss
 endif
 
 include $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk, \

diff --git a/src/frontends/android/app/src/main/jni/libandroidbridge/Android.mk b/src/frontends/android/app/src/main/jni/libandroidbridge/Android.mk
@@ -33,6 +33,7 @@ LOCAL_C_INCLUDES += \
 	$(strongswan_PATH)/src/libimcv \
 	$(strongswan_PATH)/src/libtncif \
 	$(strongswan_PATH)/src/libtnccs \
+	$(strongswan_PATH)/src/libtpmtss \
 	$(strongswan_PATH)/src/libtls
 endif
 

diff --git a/src/libimcv/Android.mk b/src/libimcv/Android.mk
@@ -48,7 +48,6 @@ libimcv_la_SOURCES := \
 	pts/pts_pcr.h pts/pts_pcr.c \
 	pts/pts_proto_caps.h \
 	pts/pts_req_func_comp_evid.h \
-	pts/pts_simple_evid_final.h \
 	pts/pts_creds.h pts/pts_creds.c \
 	pts/pts_database.h pts/pts_database.c \
 	pts/pts_dh_group.h pts/pts_dh_group.c \
@@ -107,6 +106,7 @@ LOCAL_SRC_FILES := $(filter %.c,$(libimcv_la_SOURCES))
 
 LOCAL_C_INCLUDES += \
 	$(strongswan_PATH)/src/libtncif \
+	$(strongswan_PATH)/src/libtpmtss \
 	$(strongswan_PATH)/src/libstrongswan
 
 LOCAL_CFLAGS := $(strongswan_CFLAGS)
@@ -119,6 +119,6 @@ LOCAL_ARM_MODE := arm
 
 LOCAL_PRELINK_MODULE := false
 
-LOCAL_SHARED_LIBRARIES += libstrongswan libtncif
+LOCAL_SHARED_LIBRARIES += libstrongswan libtncif libtpmtss
 
 include $(BUILD_SHARED_LIBRARY)