From 0462e9a7d9c110f5ffcded986e63c93638c56725 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Sun, 18 Nov 2018 03:34:59 -0500
Subject: [PATCH] Update external dependencies

---
 native/jni/external/Android.mk | 73 +++++++++++++++++++++++++++++++++-
 native/jni/external/dtc        |  2 +-
 native/jni/external/lz4        |  2 +-
 native/jni/external/nanopb     |  2 +-
 native/jni/external/selinux    |  2 +-
 5 files changed, 76 insertions(+), 5 deletions(-)

diff --git a/native/jni/external/Android.mk b/native/jni/external/Android.mk
index 25b61d7d4..bd741d42d 100644
--- a/native/jni/external/Android.mk
+++ b/native/jni/external/Android.mk
@@ -189,4 +189,75 @@ LOCAL_CFLAGS += -DHAVE_CONFIG_H -Wno-implicit-function-declaration
 include $(BUILD_STATIC_LIBRARY)
 
 # libsepol.a
-include $(SE_PATH)/libsepol/Android.mk
+include $(CLEAR_VARS)
+LOCAL_MODULE := libsepol
+LOCAL_C_INCLUDES := $(LIBSEPOL) $(EXT_PATH)/selinux/libsepol/src
+LOCAL_SRC_FILES := \
+	selinux/libsepol/src/assertion.c \
+	selinux/libsepol/src/avrule_block.c \
+	selinux/libsepol/src/avtab.c \
+	selinux/libsepol/src/boolean_record.c \
+	selinux/libsepol/src/booleans.c \
+	selinux/libsepol/src/conditional.c \
+	selinux/libsepol/src/constraint.c \
+	selinux/libsepol/src/context.c \
+	selinux/libsepol/src/context_record.c \
+	selinux/libsepol/src/debug.c \
+	selinux/libsepol/src/ebitmap.c \
+	selinux/libsepol/src/expand.c \
+	selinux/libsepol/src/genbools.c \
+	selinux/libsepol/src/genusers.c \
+	selinux/libsepol/src/handle.c \
+	selinux/libsepol/src/hashtab.c \
+	selinux/libsepol/src/hierarchy.c \
+	selinux/libsepol/src/ibendport_record.c \
+	selinux/libsepol/src/ibendports.c \
+	selinux/libsepol/src/ibpkey_record.c \
+	selinux/libsepol/src/ibpkeys.c \
+	selinux/libsepol/src/iface_record.c \
+	selinux/libsepol/src/interfaces.c \
+	selinux/libsepol/src/kernel_to_cil.c \
+	selinux/libsepol/src/kernel_to_common.c \
+	selinux/libsepol/src/kernel_to_conf.c \
+	selinux/libsepol/src/link.c \
+	selinux/libsepol/src/mls.c \
+	selinux/libsepol/src/module.c \
+	selinux/libsepol/src/module_to_cil.c \
+	selinux/libsepol/src/node_record.c \
+	selinux/libsepol/src/nodes.c \
+	selinux/libsepol/src/polcaps.c \
+	selinux/libsepol/src/policydb.c \
+	selinux/libsepol/src/policydb_convert.c \
+	selinux/libsepol/src/policydb_public.c \
+	selinux/libsepol/src/port_record.c \
+	selinux/libsepol/src/ports.c \
+	selinux/libsepol/src/roles.c \
+	selinux/libsepol/src/services.c \
+	selinux/libsepol/src/sidtab.c \
+	selinux/libsepol/src/symtab.c \
+	selinux/libsepol/src/user_record.c \
+	selinux/libsepol/src/users.c \
+	selinux/libsepol/src/util.c \
+	selinux/libsepol/src/write.c \
+	selinux/libsepol/cil/src/cil_fqn.c \
+	selinux/libsepol/cil/src/cil_policy.c \
+	selinux/libsepol/cil/src/cil_resolve_ast.c \
+	selinux/libsepol/cil/src/cil_mem.c \
+	selinux/libsepol/cil/src/cil_strpool.c \
+	selinux/libsepol/cil/src/cil_symtab.c \
+	selinux/libsepol/cil/src/cil_log.c \
+	selinux/libsepol/cil/src/cil_lexer.c \
+	selinux/libsepol/cil/src/cil_reset_ast.c \
+	selinux/libsepol/cil/src/cil_parser.c \
+	selinux/libsepol/cil/src/cil_copy_ast.c \
+	selinux/libsepol/cil/src/cil_list.c \
+	selinux/libsepol/cil/src/cil_build_ast.c \
+	selinux/libsepol/cil/src/cil_tree.c \
+	selinux/libsepol/cil/src/cil_stack.c \
+	selinux/libsepol/cil/src/cil_find.c \
+	selinux/libsepol/cil/src/cil_binary.c \
+	selinux/libsepol/cil/src/cil_verify.c \
+	selinux/libsepol/cil/src/cil.c \
+	selinux/libsepol/cil/src/cil_post.c
+LOCAL_CFLAGS += -Dgetline=__getline -Wno-implicit-function-declaration
+include $(BUILD_STATIC_LIBRARY)
diff --git a/native/jni/external/dtc b/native/jni/external/dtc
index e54388015..88f18909d 160000
--- a/native/jni/external/dtc
+++ b/native/jni/external/dtc
@@ -1 +1 @@
-Subproject commit e54388015af1fb4bf04d0bca99caba1074d9cc42
+Subproject commit 88f18909db731a627456f26d779445f84e449536
diff --git a/native/jni/external/lz4 b/native/jni/external/lz4
index dfed9fa1d..641b453d9 160000
--- a/native/jni/external/lz4
+++ b/native/jni/external/lz4
@@ -1 +1 @@
-Subproject commit dfed9fa1d77f0434306d377c4da1f7191d3ba08a
+Subproject commit 641b453d9db536ee020851bfcb1dc39f61006f0a
diff --git a/native/jni/external/nanopb b/native/jni/external/nanopb
index 04cd1f94c..3626b5c40 160000
--- a/native/jni/external/nanopb
+++ b/native/jni/external/nanopb
@@ -1 +1 @@
-Subproject commit 04cd1f94cc513b4cb3eac924c74039ccc05a944b
+Subproject commit 3626b5c40e2457629ac60a563dde523be7c10bb4
diff --git a/native/jni/external/selinux b/native/jni/external/selinux
index 4d28de872..c49f5e9d8 160000
--- a/native/jni/external/selinux
+++ b/native/jni/external/selinux
@@ -1 +1 @@
-Subproject commit 4d28de872cc6feac1ec5859ca50ca46c9f5d46ec
+Subproject commit c49f5e9d8ee90d256dfdb778701894e100cdfca0