diff --git a/PrivacyCentral/Advanced_Privacy-1.3.0-e-release.apk b/PrivacyCentral/Advanced_Privacy-1.3.0-e-release.apk index 795e07b09af3663ee305b56377c306398718e288..e996bfc020d0ae484f0fa08deb20ebda3a8c2349 100644 --- a/PrivacyCentral/Advanced_Privacy-1.3.0-e-release.apk +++ b/PrivacyCentral/Advanced_Privacy-1.3.0-e-release.apk @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c00cbd540b7bbb3db9b928043c44aff3aa0eaff7870dc9b909a6bb0f2871c650 -size 129740675 +oid sha256:7d7f5223cb66ad7a5af2d1918dffc298d0705292d6b09dad95aee308572e4f88 +size 170573696 diff --git a/PrivacyCentral/Android.mk b/PrivacyCentral/Android.mk index d269dad0a0ccbd0be46376c2f6744fe617f41ca2..d8e20ab68070d2270be57e29bfd38d9a1b1a6334 100644 --- a/PrivacyCentral/Android.mk +++ b/PrivacyCentral/Android.mk @@ -24,35 +24,16 @@ LOCAL_CERTIFICATE := platform LOCAL_PRIVILEGED_MODULE := true LOCAL_SRC_FILES := Advanced_Privacy-1.3.0-e-release.apk LOCAL_MODULE_CLASS := APPS -LOCAL_REQUIRED_MODULES := privapp-permissions-foundation.e.privacycentralapp.xml libpdnsd libtor +LOCAL_REQUIRED_MODULES := privapp-permissions-foundation.e.privacycentralapp.xml LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX) -private_jni_libs := libgojni.so libmapbox-gl.so libpdnsd.so libtor.so libtun2socks.so +private_jni_libs := libgojni.so libmapbox-gl.so libtor.so LOCAL_PREBUILT_JNI_LIBS_arm := $(foreach lib,$(private_jni_libs), @$(LIB_PATH)/$(lib)) LOCAL_PREBUILT_JNI_LIBS_arm64 := $(foreach lib,$(private_jni_libs), @$(LIB_PATH)/$(lib)) LOCAL_PREBUILT_JNI_LIBS_x86 := $(foreach lib,$(private_jni_libs), @$(LIB_PATH)/$(lib)) LOCAL_PREBUILT_JNI_LIBS_x86_64 := $(foreach lib,$(private_jni_libs), @$(LIB_PATH)/$(lib)) -private_jni_copy_libs := libgojni.so libmapbox-gl.so libtun2socks.so +private_jni_copy_libs := libgojni.so libmapbox-gl.so libtor.so LOCAL_POST_INSTALL_CMD := mkdir -p $(TARGET_OUT)/priv-app/$(LOCAL_MODULE)/lib/$(TARGET_ARCH) LOCAL_POST_INSTALL_CMD += ; $(foreach lib,$(private_jni_copy_libs), cp $(LOCAL_PATH)/$(LIB_PATH)/$(lib) $(TARGET_OUT)/priv-app/$(LOCAL_MODULE)/lib/$(TARGET_ARCH)/$(LIB);) -LOCAL_POST_INSTALL_CMD += ln -sf ../../../../bin/libtor $(TARGET_OUT)/priv-app/$(LOCAL_MODULE)/lib/$(TARGET_ARCH)/libtor.so -LOCAL_POST_INSTALL_CMD += ; ln -sf ../../../../bin/libpdnsd $(TARGET_OUT)/priv-app/$(LOCAL_MODULE)/lib/$(TARGET_ARCH)/libpdnsd.so -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := libpdnsd -LOCAL_SRC_FILES := $(LIB_PATH)/libpdnsd.so -LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES) -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := EXECUTABLES -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := libtor -LOCAL_SRC_FILES := $(LIB_PATH)/libtor.so -LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES) -LOCAL_CHECK_ELF_FILES := false -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := EXECUTABLES include $(BUILD_PREBUILT) diff --git a/PrivacyCentral/lib/arm64-v8a/libgojni.so b/PrivacyCentral/lib/arm64-v8a/libgojni.so index 0b44810a4ea37ae1a5521f3e1401f82213f05212..1985b49ae27d9a99f25c2f9bd980be38f6581933 100644 Binary files a/PrivacyCentral/lib/arm64-v8a/libgojni.so and b/PrivacyCentral/lib/arm64-v8a/libgojni.so differ diff --git a/PrivacyCentral/lib/arm64-v8a/libpdnsd.so b/PrivacyCentral/lib/arm64-v8a/libpdnsd.so deleted file mode 100644 index 5ba6e0fc39d00313cdb4aebfa4bd97174fd58f5b..0000000000000000000000000000000000000000 Binary files a/PrivacyCentral/lib/arm64-v8a/libpdnsd.so and /dev/null differ diff --git a/PrivacyCentral/lib/arm64-v8a/libtor.so b/PrivacyCentral/lib/arm64-v8a/libtor.so index f09e3b9d22445e3df9eda13218a88dd775cfff59..80a692ac614a343a64c54dbc39a021f83d65e9e0 100644 Binary files a/PrivacyCentral/lib/arm64-v8a/libtor.so and b/PrivacyCentral/lib/arm64-v8a/libtor.so differ diff --git a/PrivacyCentral/lib/arm64-v8a/libtun2socks.so b/PrivacyCentral/lib/arm64-v8a/libtun2socks.so deleted file mode 100644 index e04133dd841da8b17d851bf200a73c1c587ead63..0000000000000000000000000000000000000000 Binary files a/PrivacyCentral/lib/arm64-v8a/libtun2socks.so and /dev/null differ diff --git a/PrivacyCentral/lib/arm64-v8a/pdnsd.so b/PrivacyCentral/lib/arm64-v8a/pdnsd.so deleted file mode 100644 index f812ca783cece9a69d85753d924553da7b4caa33..0000000000000000000000000000000000000000 Binary files a/PrivacyCentral/lib/arm64-v8a/pdnsd.so and /dev/null differ diff --git a/PrivacyCentral/lib/armeabi-v7a/libgojni.so b/PrivacyCentral/lib/armeabi-v7a/libgojni.so index 01a0fe7be665f193aa855dc321277ab23d1efce5..3f4e377b1b55a88646724112498ccac3f3ff81b8 100644 Binary files a/PrivacyCentral/lib/armeabi-v7a/libgojni.so and b/PrivacyCentral/lib/armeabi-v7a/libgojni.so differ diff --git a/PrivacyCentral/lib/armeabi-v7a/libpdnsd.so b/PrivacyCentral/lib/armeabi-v7a/libpdnsd.so deleted file mode 100644 index 29c29b52fb31024619c94021bf497ef736a361d6..0000000000000000000000000000000000000000 Binary files a/PrivacyCentral/lib/armeabi-v7a/libpdnsd.so and /dev/null differ diff --git a/PrivacyCentral/lib/armeabi-v7a/libtor.so b/PrivacyCentral/lib/armeabi-v7a/libtor.so index 0e2f8a7786ae2e9b69a89408a2f1e92526051bd8..9ddd675e33dcd6ad9e9b04b4cdba1e70d34d22c6 100644 Binary files a/PrivacyCentral/lib/armeabi-v7a/libtor.so and b/PrivacyCentral/lib/armeabi-v7a/libtor.so differ diff --git a/PrivacyCentral/lib/armeabi-v7a/libtun2socks.so b/PrivacyCentral/lib/armeabi-v7a/libtun2socks.so deleted file mode 100644 index c9e94a7139c1f17a2d7e1e9f6fce1a600e063cc6..0000000000000000000000000000000000000000 Binary files a/PrivacyCentral/lib/armeabi-v7a/libtun2socks.so and /dev/null differ diff --git a/PrivacyCentral/lib/armeabi-v7a/pdnsd.so b/PrivacyCentral/lib/armeabi-v7a/pdnsd.so deleted file mode 100644 index 8f843222fb6156ef7a0c78dbf8fd68f9263bc373..0000000000000000000000000000000000000000 Binary files a/PrivacyCentral/lib/armeabi-v7a/pdnsd.so and /dev/null differ diff --git a/PrivacyCentral/lib/x86/libgojni.so b/PrivacyCentral/lib/x86/libgojni.so index d5f0334d4ed2822db544dd3ec1cdb8e02f107914..135cc06dbc0d7fec76c77c7f399299fc55096e6a 100644 Binary files a/PrivacyCentral/lib/x86/libgojni.so and b/PrivacyCentral/lib/x86/libgojni.so differ diff --git a/PrivacyCentral/lib/x86/libpdnsd.so b/PrivacyCentral/lib/x86/libpdnsd.so deleted file mode 100644 index b4e7a9ee55d16666e0117846d41b07c95d6deb7e..0000000000000000000000000000000000000000 Binary files a/PrivacyCentral/lib/x86/libpdnsd.so and /dev/null differ diff --git a/PrivacyCentral/lib/x86/libtor.so b/PrivacyCentral/lib/x86/libtor.so index 191b82c08555cacf5500c39e96b29dc8e9e1e8d9..c424b1e830302f7b59a42e53ced129cc8f88d442 100644 Binary files a/PrivacyCentral/lib/x86/libtor.so and b/PrivacyCentral/lib/x86/libtor.so differ diff --git a/PrivacyCentral/lib/x86/libtun2socks.so b/PrivacyCentral/lib/x86/libtun2socks.so deleted file mode 100644 index 23260e217e15c3707d0e7f9ba5113f2debc1df40..0000000000000000000000000000000000000000 Binary files a/PrivacyCentral/lib/x86/libtun2socks.so and /dev/null differ diff --git a/PrivacyCentral/lib/x86/pdnsd.so b/PrivacyCentral/lib/x86/pdnsd.so deleted file mode 100644 index 4d018a642415ab147bc258a341921238f165e1b0..0000000000000000000000000000000000000000 Binary files a/PrivacyCentral/lib/x86/pdnsd.so and /dev/null differ diff --git a/PrivacyCentral/lib/x86_64/libgojni.so b/PrivacyCentral/lib/x86_64/libgojni.so index 1639e72c7265e3afbc579063d10525e5c0fce702..1bd18bd4c5b992f600dfd2050d6fed4cdc2c1cb1 100644 Binary files a/PrivacyCentral/lib/x86_64/libgojni.so and b/PrivacyCentral/lib/x86_64/libgojni.so differ diff --git a/PrivacyCentral/lib/x86_64/libpdnsd.so b/PrivacyCentral/lib/x86_64/libpdnsd.so deleted file mode 100644 index 20585f7c06e2158609728a1aad1650c7483db016..0000000000000000000000000000000000000000 Binary files a/PrivacyCentral/lib/x86_64/libpdnsd.so and /dev/null differ diff --git a/PrivacyCentral/lib/x86_64/libtor.so b/PrivacyCentral/lib/x86_64/libtor.so index bf2451f38838a630778753d58c8321ea738652ac..fa0f8c0352d03c42bfa5c763dba2fde0457d1ece 100644 Binary files a/PrivacyCentral/lib/x86_64/libtor.so and b/PrivacyCentral/lib/x86_64/libtor.so differ diff --git a/PrivacyCentral/lib/x86_64/libtun2socks.so b/PrivacyCentral/lib/x86_64/libtun2socks.so deleted file mode 100644 index 0f6c62564e2cd9b9daeb022eaa1db2136c3484f2..0000000000000000000000000000000000000000 Binary files a/PrivacyCentral/lib/x86_64/libtun2socks.so and /dev/null differ diff --git a/PrivacyCentral/lib/x86_64/pdnsd.so b/PrivacyCentral/lib/x86_64/pdnsd.so deleted file mode 100644 index af2616f8433fba86a27233db337e610be8502ca2..0000000000000000000000000000000000000000 Binary files a/PrivacyCentral/lib/x86_64/pdnsd.so and /dev/null differ