Merge remote-tracking branch 'upstream-public/pr/2225' into development-psa-proposed

This commit is contained in:
Jaeden Amero 2018-11-23 17:37:04 +00:00
commit bb225f7914
2 changed files with 3 additions and 0 deletions

View file

@ -16,6 +16,8 @@ LOCAL_LDFLAGS = -L../library \
ifdef USE_CRYPTO_SUBMODULE
LOCAL_LDFLAGS += -L../crypto/library
LOCAL_CFLAGS += -I../crypto/include
LOCAL_CXXFLAGS += -I../crypto/include
endif
ifndef SHARED

View file

@ -14,6 +14,7 @@ LOCAL_LDFLAGS = -L../library \
ifdef USE_CRYPTO_SUBMODULE
LOCAL_LDFLAGS += -L../crypto/library
LOCAL_CFLAGS += -I../crypto/include
CRYPTO := ../crypto/library/
else
CRYPTO := ../library/