pEp.foundation
/
pEpJNIAdapter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

PEMA-103 Blocked with uuid static library building

pull/25/head
ignaciogarcia 3 years ago
committed by Sascha Bacardit
parent
ed72e2a29e
commit
0f147bbb4c
2 changed files with 15 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      android/external/libuuid.Android.mk
  2. 13
      android/jni/Android.mk

2
android/external/libuuid.Android.mk
View File

@ -2,6 +2,7 @@
# #
# This file is under GNU General Public License 3.0 # This file is under GNU General Public License 3.0
# see LICENSE.txt # see LICENSE.txt
$(warning ==== UUID android.mk START)
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
@ -11,4 +12,5 @@ LOCAL_MODULE := libuuid
ENGINE_SRC_FILES := $(wildcard $(LOCAL_PATH)/../*.c) ENGINE_SRC_FILES := $(wildcard $(LOCAL_PATH)/../*.c)
LOCAL_SRC_FILES := $(ENGINE_SRC_FILES:%=%) LOCAL_SRC_FILES := $(ENGINE_SRC_FILES:%=%)
$(warning ==== UUID android.mk BUILD STATIC LIBRARY UUID.A)
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)

13
android/jni/Android.mk
View File

@ -45,7 +45,8 @@ $(shell sh $(ENGINE_PATH)/build-android/takeOutHeaderFiles.sh $(ENGINE_PATH))
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := pEpJNI LOCAL_MODULE := pEpJNI
LOCAL_SHARED_LIBRARIES := libnettle libhogweed libgmp libpep_engine_sequoia_backend LOCAL_SHARED_LIBRARIES := libnettle libhogweed libgmp libpep_engine_sequoia_backend
LOCAL_STATIC_LIBRARIES := pEpEngine libetpan libiconv libuuid pEpAdapter pEpCxx11 LOCAL_STATIC_LIBRARIES := pEpEngine libetpan libiconv pEpAdapter pEpCxx11
LOCAL_WHOLE_STATIC_LIBRARIES := libuuid
LOCAL_CPP_FEATURES += exceptions LOCAL_CPP_FEATURES += exceptions
LOCAL_CPPFLAGS += -std=c++11 -DANDROID_STL=c++_shared -DHAVE_PTHREADS -DDISABLE_SYNC -fuse-ld=lld LOCAL_CPPFLAGS += -std=c++11 -DANDROID_STL=c++_shared -DHAVE_PTHREADS -DDISABLE_SYNC -fuse-ld=lld
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
@ -91,12 +92,18 @@ $(warning ==== CURRENT NDK LIBS OUT: $(NDK_LIBS_OUT))
$(warning ==== CURRENT NDK OUT: $(NDK_OUT)) $(warning ==== CURRENT NDK OUT: $(NDK_OUT))
$(warning ==== CURRENT TARGET OUT: $(TARGET_OUT)) $(warning ==== CURRENT TARGET OUT: $(TARGET_OUT))
#$(shell sleep 2)
#$(warning ==== after sleeping 2 seconds)
#$(shell sleep 2)
#$(warning ==== after sleeping 4 seconds)
#$(shell sleep 2)
#$(warning ==== after sleeping 6 seconds)
## pEpEngine ## pEpEngine
$(warning ==== JNIADAPTER android.mk CALLING import-module pEpEngine) $(warning ==== JNIADAPTER android.mk CALLING import-module pEpEngine)
$(call import-module, pEpEngine/build-android/jni/) $(call import-module, pEpEngine/build-android/jni/)
$(warning ==== CURRENT LOCAL BUILT MODULE: $(LOCAL_BUILT_MODULE)) $(warning ==== CURRENT LOCAL BUILT MODULE: $(LOCAL_BUILT_MODULE))
pEpEngine.ndkBuild.stamp: $(MY_UUID_BUILD) #pEpEngine.ndkBuild.stamp: $(MY_UUID_BUILD)
echo "==== INSIDE RECIPE: JNIADAPTER android.mk CALLING import-module pEpEngine" #echo "==== INSIDE RECIPE: JNIADAPTER android.mk CALLING import-module pEpEngine"
$(warning ==== JNIADAPTER android.mk CALLING import-module pEpEngine) $(warning ==== JNIADAPTER android.mk CALLING import-module pEpEngine)
$(call import-module, pEpEngine/build-android/jni/) $(call import-module, pEpEngine/build-android/jni/)
$(warning ==== CURRENT LOCAL BUILT MODULE: $(LOCAL_BUILT_MODULE)) $(warning ==== CURRENT LOCAL BUILT MODULE: $(LOCAL_BUILT_MODULE))

Write Preview
Loading…
Cancel
Save