From f476daa0417eb8d870fd52b73745511a658648e6 Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Wed, 5 Apr 2017 09:14:33 +0800 Subject: [PATCH] Change parts of library to shared libsqlite and libselinux are shipped with Android systems We build them here for the compiler to link against it, we actually use the one in /system/lib(64) --- jni/Android.mk | 5 +++-- jni/magiskpolicy | 2 +- jni/selinux | 2 +- jni/sqlite3/Android.mk | 6 +++--- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/jni/Android.mk b/jni/Android.mk index 418952710..ab392d9af 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -2,7 +2,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := magisk -LOCAL_STATIC_LIBRARIES := libselinux libsepol libsqlite3 +LOCAL_STATIC_LIBRARIES := libsepol +LOCAL_SHARED_LIBRARIES := libsqlite libselinux LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/utils \ @@ -34,7 +35,7 @@ LOCAL_SRC_FILES := \ su/utils.c \ su/pts.c -LOCAL_CFLAGS := -static -Wno-implicit-exception-spec-mismatch +LOCAL_CFLAGS := -Wno-implicit-exception-spec-mismatch LOCAL_LDLIBS := -llog include $(BUILD_EXECUTABLE) diff --git a/jni/magiskpolicy b/jni/magiskpolicy index cd498711b..7bb8b9039 160000 --- a/jni/magiskpolicy +++ b/jni/magiskpolicy @@ -1 +1 @@ -Subproject commit cd498711bc6b03375c0e7ca62708e9f34b71a339 +Subproject commit 7bb8b9039c96278f904e3e7fa07953cd5e5b5113 diff --git a/jni/selinux b/jni/selinux index d2f80c3bc..11a8f7c25 160000 --- a/jni/selinux +++ b/jni/selinux @@ -1 +1 @@ -Subproject commit d2f80c3bcc095526855d97d9202da2158fbced5c +Subproject commit 11a8f7c25d689d84c4eae8ef6245af57a51b1dc5 diff --git a/jni/sqlite3/Android.mk b/jni/sqlite3/Android.mk index 6e942f886..18f1fd226 100644 --- a/jni/sqlite3/Android.mk +++ b/jni/sqlite3/Android.mk @@ -1,10 +1,10 @@ LOCAL_PATH:= $(call my-dir) ## -# libsqlite3.a +# libsqlite.so # include $(CLEAR_VARS) -LOCAL_MODULE:= libsqlite3 +LOCAL_MODULE:= libsqlite LOCAL_SRC_FILES := sqlite3.c shell.c -include $(BUILD_STATIC_LIBRARY) +include $(BUILD_SHARED_LIBRARY)