Browse Source

Update android MakeFiles

JNI-88
Hussein Kasem 6 years ago
parent
commit
405919dd08
  1. 3
      android/external/Makefile
  2. 1
      android/jni/Android.mk

3
android/external/Makefile

@ -13,6 +13,7 @@ NDK_TOOLCHAIN_VERSION ?= clang
APP_ABI ?= armeabi-v7a APP_ABI ?= armeabi-v7a
APP_PLATFORM ?= android-18 APP_PLATFORM ?= android-18
PEP_PACKAGE_NAME ?= security.pEp PEP_PACKAGE_NAME ?= security.pEp
APP_OPTIM ?= debug
all: build assets all: build assets
@ -356,7 +357,7 @@ nettle-install: $(LOCAL)/lib/libnettle.so
# Sequoia-ffi # Sequoia-ffi
EXTERNAL_GIT_REPOS += sequoia|https://gitlab.com/husspEp/sequoia.git?master EXTERNAL_GIT_REPOS += sequoia|https://gitlab.com/husspEp/sequoia.git?master
CARGO_TARGET_DIR=$(EXTERNAL_ROOT)/sequoia/build/$(APP_ABI) CARGO_TARGET_DIR=$(EXTERNAL_ROOT)/build/$(APP_ABI)

1
android/jni/Android.mk

@ -68,7 +68,6 @@ LOCAL_SRC_FILES := foundation_pEp_jniadapter_AndroidHelper.cc
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
$(call import-add-path,$(SRC_PATH)) $(call import-add-path,$(SRC_PATH))
$(call import-module, pEpEngine/build-android/jni/) $(call import-module, pEpEngine/build-android/jni/)
$(info $(LOCAL_PATH))
$(call import-module, libpEpAdapter/build-android/jni/) $(call import-module, libpEpAdapter/build-android/jni/)
$(info $(LOCAL_PATH)) $(info $(LOCAL_PATH))
$(call import-module, pEpJNIAdapter/android/external/uuid/jni) $(call import-module, pEpJNIAdapter/android/external/uuid/jni)

Loading…
Cancel
Save