From 451a9c51504f9f02bf2fbaf55e6f41f4a065a0fb Mon Sep 17 00:00:00 2001 From: Ryan Pavlik <ryan.pavlik@collabora.com> Date: Mon, 9 Nov 2020 14:33:00 -0600 Subject: [PATCH] android: Update to AboutLibraries 8.5.0 This includes my submission allowing licenses to be included explicitly in the gradle files. --- build.gradle | 2 +- doc/changes/misc_features/mr.592.md | 4 ++++ src/xrt/targets/openxr_android/build.gradle | 7 +++++++ .../src/main/res/values/library_eigen_strings.xml | 2 +- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 4f335b405..6d0966e67 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { ext.kotlin_version = '1.4.10' - ext.latestAboutLibsRelease = "8.4.3" + ext.latestAboutLibsRelease = "8.5.0" repositories { google() jcenter() diff --git a/doc/changes/misc_features/mr.592.md b/doc/changes/misc_features/mr.592.md index bd195e581..ce9bc9d80 100644 --- a/doc/changes/misc_features/mr.592.md +++ b/doc/changes/misc_features/mr.592.md @@ -1 +1,5 @@ +--- +- mr.595 +- issue.105 +--- Additional improvements to the Android port. diff --git a/src/xrt/targets/openxr_android/build.gradle b/src/xrt/targets/openxr_android/build.gradle index 3198c0c7d..69372bfce 100644 --- a/src/xrt/targets/openxr_android/build.gradle +++ b/src/xrt/targets/openxr_android/build.gradle @@ -120,6 +120,13 @@ android { aboutLibraries { configPath = "${projectDir}/config" + + // Full license text for license IDs mentioned here + // will be included, even if no detected dependency uses them. + additionalLicenses { + mit + mpl_2_0 + } } dependencies { diff --git a/src/xrt/targets/openxr_android/src/main/res/values/library_eigen_strings.xml b/src/xrt/targets/openxr_android/src/main/res/values/library_eigen_strings.xml index a972a7211..ac779e014 100644 --- a/src/xrt/targets/openxr_android/src/main/res/values/library_eigen_strings.xml +++ b/src/xrt/targets/openxr_android/src/main/res/values/library_eigen_strings.xml @@ -6,7 +6,7 @@ --> <string name="define_plu_eigen"></string> <string name="library_eigen_author">Benoît Jacob, Gaël Guennebaud</string> - <string name="library_eigen_libraryWebsite">http://http://eigen.tuxfamily.org</string> + <string name="library_eigen_libraryWebsite">http://eigen.tuxfamily.org</string> <string name="library_eigen_libraryName">Eigen</string> <string name="library_eigen_libraryDescription">Eigen is a C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms.</string> <string name="library_eigen_licenseIds">mpl_2_0</string>