mirror of
https://github.com/amnezia-vpn/amnezia-client.git
synced 2026-05-08 14:33:23 +00:00
Little cleanup
This commit is contained in:
@@ -251,9 +251,6 @@ android {
|
||||
QT += core-private
|
||||
ANDROID_ABIS = $$ANDROID_TARGET_ARCH
|
||||
}
|
||||
# else {
|
||||
# QT += androidextras
|
||||
# }
|
||||
|
||||
DEFINES += MVPN_ANDROID
|
||||
|
||||
|
||||
@@ -71,23 +71,6 @@ private:
|
||||
bool m_serviceConnected = false;
|
||||
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);
|
||||
};
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user