From c3f423aad57f65c42819a00de85b7dd39085b288 Mon Sep 17 00:00:00 2001 From: Dmitriy Karpushin Date: Tue, 17 Jan 2023 10:27:14 +0300 Subject: [PATCH] Little cleanup --- client/client.pro | 3 --- client/platforms/android/android_controller.h | 17 ----------------- deploy/build_android.sh | 6 ------ 3 files changed, 26 deletions(-) diff --git a/client/client.pro b/client/client.pro index b742cefe..7cc0f455 100644 --- a/client/client.pro +++ b/client/client.pro @@ -251,9 +251,6 @@ android { QT += core-private ANDROID_ABIS = $$ANDROID_TARGET_ARCH } -# else { -# QT += androidextras -# } DEFINES += MVPN_ANDROID diff --git a/client/platforms/android/android_controller.h b/client/platforms/android/android_controller.h index bd2c2f01..73877b5a 100644 --- a/client/platforms/android/android_controller.h +++ b/client/platforms/android/android_controller.h @@ -71,23 +71,6 @@ private: bool m_serviceConnected = false; std::function m_logCallback; -// QAndroidBinder m_serviceBinder; -// class VPNBinder : public QAndroidBinder { -// public: -// VPNBinder(AndroidController* controller) : m_controller(controller) {} - -// bool onTransact(int code, const QAndroidParcel& data, -// const QAndroidParcel& reply, -// QAndroidBinder::CallType flags) override; - -// QString readUTF8Parcel(QAndroidParcel data); - -// private: -// AndroidController* m_controller = nullptr; -// }; - -// VPNBinder m_binder; - static void startActivityForResult(JNIEnv* env, jobject /*thiz*/, jobject intent); }; diff --git a/deploy/build_android.sh b/deploy/build_android.sh index 0c994a86..48b3bf5d 100644 --- a/deploy/build_android.sh +++ b/deploy/build_android.sh @@ -20,12 +20,6 @@ APP_DOMAIN=org.amneziavpn.package OUT_APP_DIR=$BUILD_DIR/client BUNDLE_DIR=$OUT_APP_DIR/$APP_FILENAME -# Seacrh Qt -if [ -z "${QT_VERSION+x}" ]; then -QT_VERSION=5.15.2; -QT_BIN_DIR=$HOME/Qt/$QT_VERSION/android/bin -fi - echo "Using Qt in $QT_BIN_DIR" echo "Using Android SDK in $ANDROID_SDK_ROOT" echo "Using Android NDK in $ANDROID_NDK_ROOT"