Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 02:52:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add hifi audio codec in Android build

Browse source
This commit is contained in:
Gabriel Calero 2018-03-12 18:29:57 -03:00
parent 109fa1d832
commit 25f207a6db
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
android/build.gradle
View file

@ -137,6 +137,13 @@ def packages = [
checksum: '20768f298f53b195e71b414b0ae240c4', checksum: '20768f298f53b195e71b414b0ae240c4',
sharedLibFolder: 'lib/release', sharedLibFolder: 'lib/release',
includeLibs: ['libtbb.so', 'libtbbmalloc.so'], includeLibs: ['libtbb.so', 'libtbbmalloc.so'],
],
hifiAC: [
file: 'libplugins_libhifiCodec.zip',
versionId: 'mzKhsRCgVmloqq5bvE.0IwYK1NjGQc_G',
checksum: '9412a8e12c88a4096c1fc843bb9fe52d',
sharedLibFolder: '',
includeLibs: ['libplugins_libhifiCodec.so']
] ]
] ]
@ -353,6 +360,7 @@ task verifyGvr(type: Verify) { def p = packages['gvr']; src new File(baseFolder,
task verifyOpenSSL(type: Verify) { def p = packages['openssl']; src new File(baseFolder, p['file']); checksum p['checksum'] } task verifyOpenSSL(type: Verify) { def p = packages['openssl']; src new File(baseFolder, p['file']); checksum p['checksum'] }
task verifyPolyvox(type: Verify) { def p = packages['polyvox']; src new File(baseFolder, p['file']); checksum p['checksum'] } task verifyPolyvox(type: Verify) { def p = packages['polyvox']; src new File(baseFolder, p['file']); checksum p['checksum'] }
task verifyTBB(type: Verify) { def p = packages['tbb']; src new File(baseFolder, p['file']); checksum p['checksum'] } task verifyTBB(type: Verify) { def p = packages['tbb']; src new File(baseFolder, p['file']); checksum p['checksum'] }
task verifyHifiAC(type: Verify) { def p = packages['hifiAC']; src new File(baseFolder, p['file']); checksum p['checksum'] }
task verifyDependencyDownloads(dependsOn: downloadDependencies) { } task verifyDependencyDownloads(dependsOn: downloadDependencies) { }
verifyDependencyDownloads.dependsOn verifyQt verifyDependencyDownloads.dependsOn verifyQt
@ -362,6 +370,7 @@ verifyDependencyDownloads.dependsOn verifyGvr
verifyDependencyDownloads.dependsOn verifyOpenSSL verifyDependencyDownloads.dependsOn verifyOpenSSL
verifyDependencyDownloads.dependsOn verifyPolyvox verifyDependencyDownloads.dependsOn verifyPolyvox
verifyDependencyDownloads.dependsOn verifyTBB verifyDependencyDownloads.dependsOn verifyTBB
verifyDependencyDownloads.dependsOn verifyHifiAC
task extractDependencies(dependsOn: verifyDependencyDownloads) { task extractDependencies(dependsOn: verifyDependencyDownloads) {
doLast { doLast {

8
libraries/plugins/src/plugins/PluginManager.cpp
View file

@ -96,7 +96,9 @@ const LoaderList& getLoadedPlugins() {
static std::once_flag once; static std::once_flag once;
static LoaderList loadedPlugins; static LoaderList loadedPlugins;
std::call_once(once, [&] { std::call_once(once, [&] {
#ifdef Q_OS_MAC #if defined(Q_OS_ANDROID)
QString pluginPath = QCoreApplication::applicationDirPath() + "/";
#elif defined(Q_OS_MAC)
QString pluginPath = QCoreApplication::applicationDirPath() + "/../PlugIns/"; QString pluginPath = QCoreApplication::applicationDirPath() + "/../PlugIns/";
#else #else
QString pluginPath = QCoreApplication::applicationDirPath() + "/plugins/"; QString pluginPath = QCoreApplication::applicationDirPath() + "/plugins/";
@ -106,6 +108,10 @@ const LoaderList& getLoadedPlugins() {
pluginDir.setFilter(QDir::Files); pluginDir.setFilter(QDir::Files);
if (pluginDir.exists()) { if (pluginDir.exists()) {
qInfo() << "Loading runtime plugins from " << pluginPath; qInfo() << "Loading runtime plugins from " << pluginPath;
#if defined(Q_OS_ANDROID)
// Can be a better filter and those libs may have a better name to destinguish them from qt plugins
pluginDir.setNameFilters(QStringList() << "libplugins_lib*.so");
#endif
auto candidates = pluginDir.entryList(); auto candidates = pluginDir.entryList();
for (auto plugin : candidates) { for (auto plugin : candidates) {
qCDebug(plugins) << "Attempting plugin" << qPrintable(plugin); qCDebug(plugins) << "Attempting plugin" << qPrintable(plugin);