From db91947eb0061d88f242cbb0bfe90fd1c6a77bb0 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Sun, 17 Sep 2023 21:47:14 +0300 Subject: [PATCH] Android: remove redundant QtNativeLibrariesDir class MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This class is now not used anywhere after QtLoader refactoring. Task-number: QTBUG-115016 Change-Id: I3399ba68fe85396f88766e9547cdfefc30baf6ed Reviewed-by: Tinja Paavoseppä --- src/android/jar/CMakeLists.txt | 1 - .../qt/android/QtNativeLibrariesDir.java | 24 ------------------- 2 files changed, 25 deletions(-) delete mode 100644 src/android/jar/src/org/qtproject/qt/android/QtNativeLibrariesDir.java diff --git a/src/android/jar/CMakeLists.txt b/src/android/jar/CMakeLists.txt index 0f8d08fffe..e8caf69818 100644 --- a/src/android/jar/CMakeLists.txt +++ b/src/android/jar/CMakeLists.txt @@ -22,7 +22,6 @@ set(java_sources src/org/qtproject/qt/android/QtLayout.java src/org/qtproject/qt/android/QtMessageDialogHelper.java src/org/qtproject/qt/android/QtNative.java - src/org/qtproject/qt/android/QtNativeLibrariesDir.java src/org/qtproject/qt/android/QtSurface.java src/org/qtproject/qt/android/QtThread.java src/org/qtproject/qt/android/extras//QtAndroidBinder.java diff --git a/src/android/jar/src/org/qtproject/qt/android/QtNativeLibrariesDir.java b/src/android/jar/src/org/qtproject/qt/android/QtNativeLibrariesDir.java deleted file mode 100644 index b857e7b607..0000000000 --- a/src/android/jar/src/org/qtproject/qt/android/QtNativeLibrariesDir.java +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// Copyright (C) 2012 BogDan Vatra -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only - -package org.qtproject.qt.android; - -import android.content.Context; -import android.content.pm.ApplicationInfo; -import android.content.pm.PackageManager.NameNotFoundException; - -public class QtNativeLibrariesDir { - public static final String systemLibrariesDir = "/system/lib/"; - public static String nativeLibrariesDir(Context context) - { - String m_nativeLibraryDir = null; - try { - ApplicationInfo ai = context.getPackageManager().getApplicationInfo(context.getPackageName(), 0); - m_nativeLibraryDir = ai.nativeLibraryDir + "/"; - } catch (NameNotFoundException e) { - e.printStackTrace(); - } - return m_nativeLibraryDir; - } -}