AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Little cleanup

Browse source
This commit is contained in:
Dmitriy Karpushin 2023-01-17 10:27:14 +03:00
parent ff79ffd1c8
commit c3f423aad5
3 changed files with 0 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

3
client/client.pro
View file

@ -251,9 +251,6 @@ android {
QT += core-private QT += core-private
ANDROID_ABIS = $$ANDROID_TARGET_ARCH ANDROID_ABIS = $$ANDROID_TARGET_ARCH
} }
# else {
# QT += androidextras
# }
DEFINES += MVPN_ANDROID DEFINES += MVPN_ANDROID

17
client/platforms/android/android_controller.h
View file

@ -71,23 +71,6 @@ private:
bool m_serviceConnected = false; bool m_serviceConnected = false;
std::function<void(const QString&)> m_logCallback; std::function<void(const QString&)> 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); static void startActivityForResult(JNIEnv* env, jobject /*thiz*/, jobject intent);
}; };

6
deploy/build_android.sh
View file

@ -20,12 +20,6 @@ APP_DOMAIN=org.amneziavpn.package
OUT_APP_DIR=$BUILD_DIR/client OUT_APP_DIR=$BUILD_DIR/client
BUNDLE_DIR=$OUT_APP_DIR/$APP_FILENAME 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 Qt in $QT_BIN_DIR"
echo "Using Android SDK in $ANDROID_SDK_ROOT" echo "Using Android SDK in $ANDROID_SDK_ROOT"
echo "Using Android NDK in $ANDROID_NDK_ROOT" echo "Using Android NDK in $ANDROID_NDK_ROOT"