diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2016-06-28 11:28:15 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2016-06-28 11:28:15 +0200 |
| commit | 6b726b6fb2ee1d8b20c462260ef25200b53235e2 (patch) | |
| tree | 2dd23afc8456d50827027fba1b566cfefbc593e1 | |
| parent | 6a24637dcbfc8f4dd09da2e2f89681900c5f3142 (diff) | |
| download | strongswan-6b726b6fb2ee1d8b20c462260ef25200b53235e2.tar.bz2 strongswan-6b726b6fb2ee1d8b20c462260ef25200b53235e2.tar.xz | |
android: Fix build after adding libtpmtss
| -rw-r--r-- | Android.mk | 3 | ||||
| -rw-r--r-- | src/frontends/android/app/src/main/jni/Android.mk | 3 | ||||
| -rw-r--r-- | src/frontends/android/app/src/main/jni/libandroidbridge/Android.mk | 1 | ||||
| -rw-r--r-- | src/libimcv/Android.mk | 4 |
4 files changed, 7 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk index 3899eff23..0ca462ee3 100644 --- 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 index 5bbfeaa1b..849bdec31 100644 --- 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 index 31eb27f96..8c4224e56 100644 --- 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 index 80e2aaadb..89ce5801a 100644 --- 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) |