Skip to content

Commit

Permalink
Move libmincrypt into separate repo
Browse files Browse the repository at this point in the history
  • Loading branch information
topjohnwu committed Jul 1, 2019
1 parent 05658ca commit 33aa4ca
Show file tree
Hide file tree
Showing 19 changed files with 8 additions and 3,022 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,6 @@
[submodule "nanopb"]
path = native/jni/external/nanopb
url = https://github.com/nanopb/nanopb.git
[submodule "mincrypt"]
path = native/jni/external/mincrypt
url = https://github.com/topjohnwu/mincrypt.git
2 changes: 2 additions & 0 deletions native/jni/Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ LIBFDT := $(EXT_PATH)/dtc/libfdt
LIBNANOPB := $(EXT_PATH)/nanopb
LIBSYSTEMPROPERTIES := jni/systemproperties/include
LIBUTILS := jni/utils/include
LIBMINCRYPT := $(EXT_PATH)/mincrypt/include

########################
# Binaries
Expand Down Expand Up @@ -127,6 +128,7 @@ LOCAL_STATIC_LIBRARIES := libmincrypt liblzma liblz4 libbz2 libfdt libutils
LOCAL_C_INCLUDES := \
jni/include \
$(EXT_PATH)/include \
$(LIBMINCRYPT) \
$(LIBLZMA) \
$(LIBLZ4) \
$(LIBBZ2) \
Expand Down
16 changes: 2 additions & 14 deletions native/jni/external/Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -28,20 +28,6 @@ LOCAL_SRC_FILES := \
xz-embedded/xz_dec_stream.c
include $(BUILD_STATIC_LIBRARY)

# libmincrypt.a
include $(CLEAR_VARS)
LOCAL_MODULE:= libmincrypt
LOCAL_C_INCLUDES := $(EXT_PATH)/include
LOCAL_SRC_FILES := \
mincrypt/dsa_sig.c \
mincrypt/p256.c \
mincrypt/p256_ec.c \
mincrypt/p256_ecdsa.c \
mincrypt/rsa.c \
mincrypt/sha.c \
mincrypt/sha256.c
include $(BUILD_STATIC_LIBRARY)

# libnanopb.a
include $(CLEAR_VARS)
LOCAL_MODULE:= libnanopb
Expand Down Expand Up @@ -265,3 +251,5 @@ LOCAL_SRC_FILES := \
selinux/libsepol/cil/src/cil_post.c
LOCAL_CFLAGS += -Dgetline=__getline -Wno-implicit-function-declaration
include $(BUILD_STATIC_LIBRARY)

include $(EXT_PATH)/mincrypt/Android.mk
43 changes: 0 additions & 43 deletions native/jni/external/include/mincrypt/dsa_sig.h

This file was deleted.

63 changes: 0 additions & 63 deletions native/jni/external/include/mincrypt/hash-internal.h

This file was deleted.

162 changes: 0 additions & 162 deletions native/jni/external/include/mincrypt/p256.h

This file was deleted.

53 changes: 0 additions & 53 deletions native/jni/external/include/mincrypt/p256_ecdsa.h

This file was deleted.

Loading

0 comments on commit 33aa4ca

Please sign in to comment.