PEMA-103 Make engine depend on transport

holly mess

build-android/jni/Android.mk

@@ -2,8 +2,11 @@
 #
 # This file is under GNU General Public License 3.0
 # see LICENSE.txt
+$(warning ==== PEPENGINE android.mk START)
 LOCAL_PATH := $(call my-dir)
 LIB_PEP_TRANSPORT_PATH:=$(SRC_PATH)/libpEpTransport
+$(warning ==== IN PEPENGINE: CURRENT LOCAL BUILT MODULE: $(LOCAL_BUILT_MODULE))
+$(warning ==== IN PEPENGINE: UUID BUILT MODULE: $(MY_UUID_BUILD))
 
 include $(CLEAR_VARS)
 
@@ -26,12 +29,13 @@ LOCAL_CFLAGS    += -DSQLITE_TEMP_STORE=3 -DUSE_SEQUOIA
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../asn.1 \
 
 LOCAL_C_INCLUDES += $(GPGBUILD)/$(TARGET_ARCH_ABI)/include
-#LOCAL_C_INCLUDES += $(LIB_PEP_TRANSPORT_PATH)/build-android/include/
+LOCAL_C_INCLUDES += $(LIB_PEP_TRANSPORT_PATH)/build-android/include/
 #LOCAL_EXPORT_C_INCLUDES += $(LIB_PEP_TRANSPORT_PATH)/build-android/include/
 #LOCAL_EXPORT_C_INCLUDES += $(GPGBUILD)/$(TARGET_ARCH_ABI)/include
 #LOCAL_EXPORT_C_INCLUDES += $(GPGBUILD)/$(TARGET_ARCH_ABI)/include
-#LOCAL_C_INCLUDES += $(LIB_PEP_TRANSPORT_PATH)/src
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../include
+LOCAL_C_INCLUDES += $(LIB_PEP_TRANSPORT_PATH)/src
+#LOCAL_EXPORT_C_INCLUDES += $(LIB_PEP_TRANSPORT_PATH)/src
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/../include
 #LOCAL_EXPORT_C_INCLUDES += $(LOCAL_PATH)/../include
 
 $(shell sh $(LOCAL_PATH)/../takeOutHeaderFiles.sh $(LOCAL_PATH)../../)
@@ -42,9 +46,11 @@ ENGINE_SRC_FILES := $(shell find $(LOCAL_PATH)/../../src/ ! -name "*gpg*" ! -nam
 #ENGINE_SRC_FILES := $(wildcard $(LOCAL_PATH)/../../src/*.c)
 ASN1_SRC_FILES := $(wildcard $(LOCAL_PATH)/../../asn.1/*.c)
 LOCAL_SRC_FILES := $(ENGINE_SRC_FILES:%=%)  $(ASN1_SRC_FILES:$(LOCAL_PATH)/%=%)
-#LOCAL_SRC_FILES := $(GPGBUILD)/$(TARGET_ARCH_ABI)/include
-#LOCAL_SRC_FILES := $(LIB_PEP_TRANSPORT_PATH)/src/*.h
-
 
+LOCAL_STATIC_LIBRARIES := pEpTransport
 
 include $(BUILD_STATIC_LIBRARY)
+
+$(call import-add-path,$(SRC_PATH))
+$(warning ==== PEPENGINE android.mk CALLING import-module LIBPEPTRANSPORT)
+$(call import-module, libpEpTransport/build-android/jni/)