diff --git a/PrivacyCentral/Android.mk b/PrivacyCentral/Android.mk index 8815d47694562cc9009210cf4f57d606105ac05a..c8004968ed3a2edeb831d06c44866a78e1e620c4 100644 --- a/PrivacyCentral/Android.mk +++ b/PrivacyCentral/Android.mk @@ -1,4 +1,13 @@ LOCAL_PATH := $(call my-dir) +ifeq ($(TARGET_ARCH), $(filter $(TARGET_ARCH), arm64)) + LIB_PATH := lib/arm64-v8a +else ifeq ($(TARGET_ARCH), $(filter $(TARGET_ARCH), arm)) + LIB_PATH := lib/armeabi-v7a +else ifeq ($(TARGET_ARCH), $(filter $(TARGET_ARCH), x86_64)) + LIB_PATH := lib/x86_64 +else ifeq ($(TARGET_ARCH), $(filter $(TARGET_ARCH), x86)) + LIB_PATH := lib/x86 +endif include $(CLEAR_VARS) LOCAL_MODULE := privapp-permissions-foundation.e.privacycentralapp.xml @@ -13,8 +22,42 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE := PrivacyCentral LOCAL_CERTIFICATE := platform LOCAL_PRIVILEGED_MODULE := true -LOCAL_SRC_FILES := privacycentral-release-unsigned.apk +ifeq ($(PLATFORM_SDK_VERSION), 30) +LOCAL_SRC_FILES := app-e30-release-unsigned.apk +else +LOCAL_SRC_FILES := app-e29-release-unsigned.apk +endif + LOCAL_MODULE_CLASS := APPS -LOCAL_REQUIRED_MODULES := privapp-permissions-foundation.e.privacycentralapp.xml +LOCAL_REQUIRED_MODULES := privapp-permissions-foundation.e.privacycentralapp.xml libpdnsd libtor LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX) + +private_jni_libs := libgojni.so libmapbox-gl.so libpdnsd.so libtor.so libtun2socks.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 +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/app-e29-release-unsigned.apk b/PrivacyCentral/app-e29-release-unsigned.apk new file mode 100644 index 0000000000000000000000000000000000000000..577c5f28edb10096e62dee32854b738f8542ce0e --- /dev/null +++ b/PrivacyCentral/app-e29-release-unsigned.apk @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:78f9f0f775462b5575e10950df3c54b8ed573f882c32c2cf6cf8047896b7533d +size 121692726 diff --git a/PrivacyCentral/app-e30-release-unsigned.apk b/PrivacyCentral/app-e30-release-unsigned.apk new file mode 100644 index 0000000000000000000000000000000000000000..92f6e1684f976763c2dfdfe00f1836690942c92d --- /dev/null +++ b/PrivacyCentral/app-e30-release-unsigned.apk @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:440c2aa91c49d6b91499fb1f3f8392df544db93c20e15b9ec33a85ee908a3c26 +size 121695806 diff --git a/PrivacyCentral/lib/arm64-v8a/libgojni.so b/PrivacyCentral/lib/arm64-v8a/libgojni.so new file mode 100644 index 0000000000000000000000000000000000000000..0b44810a4ea37ae1a5521f3e1401f82213f05212 Binary files /dev/null and b/PrivacyCentral/lib/arm64-v8a/libgojni.so differ diff --git a/PrivacyCentral/lib/arm64-v8a/libmapbox-gl.so b/PrivacyCentral/lib/arm64-v8a/libmapbox-gl.so new file mode 100644 index 0000000000000000000000000000000000000000..c65fbd82a5bdce97d778bb04ed1f63e510c6f147 Binary files /dev/null and b/PrivacyCentral/lib/arm64-v8a/libmapbox-gl.so differ diff --git a/PrivacyCentral/lib/arm64-v8a/libpdnsd.so b/PrivacyCentral/lib/arm64-v8a/libpdnsd.so new file mode 100644 index 0000000000000000000000000000000000000000..5ba6e0fc39d00313cdb4aebfa4bd97174fd58f5b Binary files /dev/null and b/PrivacyCentral/lib/arm64-v8a/libpdnsd.so differ diff --git a/PrivacyCentral/lib/arm64-v8a/libtor.so b/PrivacyCentral/lib/arm64-v8a/libtor.so new file mode 100644 index 0000000000000000000000000000000000000000..f09e3b9d22445e3df9eda13218a88dd775cfff59 Binary files /dev/null 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 new file mode 100644 index 0000000000000000000000000000000000000000..0f39be95672fbbddbb863fe395e6552cb5cf32cc Binary files /dev/null and b/PrivacyCentral/lib/arm64-v8a/libtun2socks.so differ diff --git a/PrivacyCentral/lib/armeabi-v7a/libgojni.so b/PrivacyCentral/lib/armeabi-v7a/libgojni.so new file mode 100644 index 0000000000000000000000000000000000000000..01a0fe7be665f193aa855dc321277ab23d1efce5 Binary files /dev/null and b/PrivacyCentral/lib/armeabi-v7a/libgojni.so differ diff --git a/PrivacyCentral/lib/armeabi-v7a/libmapbox-gl.so b/PrivacyCentral/lib/armeabi-v7a/libmapbox-gl.so new file mode 100644 index 0000000000000000000000000000000000000000..68fc5faa4ad14229fd3d0d6471159536c469b894 Binary files /dev/null and b/PrivacyCentral/lib/armeabi-v7a/libmapbox-gl.so differ diff --git a/PrivacyCentral/lib/armeabi-v7a/libpdnsd.so b/PrivacyCentral/lib/armeabi-v7a/libpdnsd.so new file mode 100644 index 0000000000000000000000000000000000000000..29c29b52fb31024619c94021bf497ef736a361d6 Binary files /dev/null and b/PrivacyCentral/lib/armeabi-v7a/libpdnsd.so differ diff --git a/PrivacyCentral/lib/armeabi-v7a/libtor.so b/PrivacyCentral/lib/armeabi-v7a/libtor.so new file mode 100644 index 0000000000000000000000000000000000000000..0e2f8a7786ae2e9b69a89408a2f1e92526051bd8 Binary files /dev/null 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 new file mode 100644 index 0000000000000000000000000000000000000000..e04687bf989f07247a2e9cba2e4e1a721040a9f7 Binary files /dev/null and b/PrivacyCentral/lib/armeabi-v7a/libtun2socks.so differ diff --git a/PrivacyCentral/lib/x86/libgojni.so b/PrivacyCentral/lib/x86/libgojni.so new file mode 100644 index 0000000000000000000000000000000000000000..d5f0334d4ed2822db544dd3ec1cdb8e02f107914 Binary files /dev/null and b/PrivacyCentral/lib/x86/libgojni.so differ diff --git a/PrivacyCentral/lib/x86/libmapbox-gl.so b/PrivacyCentral/lib/x86/libmapbox-gl.so new file mode 100644 index 0000000000000000000000000000000000000000..ce0c16652ca960e4252b7e36e8f6034c34f3ad1e Binary files /dev/null and b/PrivacyCentral/lib/x86/libmapbox-gl.so differ diff --git a/PrivacyCentral/lib/x86/libpdnsd.so b/PrivacyCentral/lib/x86/libpdnsd.so new file mode 100644 index 0000000000000000000000000000000000000000..b4e7a9ee55d16666e0117846d41b07c95d6deb7e Binary files /dev/null and b/PrivacyCentral/lib/x86/libpdnsd.so differ diff --git a/PrivacyCentral/lib/x86/libtor.so b/PrivacyCentral/lib/x86/libtor.so new file mode 100644 index 0000000000000000000000000000000000000000..191b82c08555cacf5500c39e96b29dc8e9e1e8d9 Binary files /dev/null and b/PrivacyCentral/lib/x86/libtor.so differ diff --git a/PrivacyCentral/lib/x86/libtun2socks.so b/PrivacyCentral/lib/x86/libtun2socks.so new file mode 100644 index 0000000000000000000000000000000000000000..837b47bd0dc8662636ecef086647c7776ded151f Binary files /dev/null and b/PrivacyCentral/lib/x86/libtun2socks.so differ diff --git a/PrivacyCentral/lib/x86_64/libgojni.so b/PrivacyCentral/lib/x86_64/libgojni.so new file mode 100644 index 0000000000000000000000000000000000000000..1639e72c7265e3afbc579063d10525e5c0fce702 Binary files /dev/null and b/PrivacyCentral/lib/x86_64/libgojni.so differ diff --git a/PrivacyCentral/lib/x86_64/libmapbox-gl.so b/PrivacyCentral/lib/x86_64/libmapbox-gl.so new file mode 100644 index 0000000000000000000000000000000000000000..b0385a042e6ee00b4de7819d273494ba698f676b Binary files /dev/null and b/PrivacyCentral/lib/x86_64/libmapbox-gl.so differ diff --git a/PrivacyCentral/lib/x86_64/libpdnsd.so b/PrivacyCentral/lib/x86_64/libpdnsd.so new file mode 100644 index 0000000000000000000000000000000000000000..20585f7c06e2158609728a1aad1650c7483db016 Binary files /dev/null and b/PrivacyCentral/lib/x86_64/libpdnsd.so differ diff --git a/PrivacyCentral/lib/x86_64/libtor.so b/PrivacyCentral/lib/x86_64/libtor.so new file mode 100644 index 0000000000000000000000000000000000000000..bf2451f38838a630778753d58c8321ea738652ac Binary files /dev/null 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 new file mode 100644 index 0000000000000000000000000000000000000000..581c2cfc51ebcfdb3ca4d5211c270df167294db0 Binary files /dev/null and b/PrivacyCentral/lib/x86_64/libtun2socks.so differ diff --git a/PrivacyCentral/privacycentral-release-unsigned.apk b/PrivacyCentral/privacycentral-release-unsigned.apk deleted file mode 100644 index c268765454c158846d00d7ea6ac8cf59bf1f5dae..0000000000000000000000000000000000000000 --- a/PrivacyCentral/privacycentral-release-unsigned.apk +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c22252adeb61065053e02e85d6496b40765143a978af0c5d8efa292507334e1e -size 64371869