From 638d25d141fdaf2ec54dfcc7d9d42207150761a3 Mon Sep 17 00:00:00 2001 From: Thorsten Behrens Date: Mon, 11 Dec 2023 00:46:43 +0100 Subject: Move Android buildfeature config to build.gradle Old gradle.properties entry was deprecated in 8.0: - https://cs.android.com/android-studio/platform/tools/base/+/0bc1c23297760643b03e8cfd8acc52c007a99cd6 Change-Id: Ia34379e8112cc2c316be229e7719c2ce1b695576 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160602 Tested-by: Jenkins Reviewed-by: Thorsten Behrens --- android/source/build.gradle | 3 +++ android/source/gradle.properties | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/android/source/build.gradle b/android/source/build.gradle index 8843330b7ba5..eed27bef4e54 100644 --- a/android/source/build.gradle +++ b/android/source/build.gradle @@ -40,6 +40,9 @@ dependencies { android { namespace 'org.libreoffice' compileSdk 34 + buildFeatures { + buildConfig = true + } // uses non-conventional source layout, so need to reconfigure accordingly // ToDo move to conventional layout, so stuff can be stripped down. sourceSets { diff --git a/android/source/gradle.properties b/android/source/gradle.properties index 76578d6146a5..19f2d673e497 100644 --- a/android/source/gradle.properties +++ b/android/source/gradle.properties @@ -1,4 +1,3 @@ -android.defaults.buildfeatures.buildconfig=true android.nonFinalResIds=false android.nonTransitiveRClass=false android.useAndroidX=true -- cgit