kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace ndk.dir with ndkPath.

Browse Source 
https://developer.android.com/studio/projects/configure-agp-ndk#agp_version_41

The documentation tells you to be careful about this, since you're
putting local-only information into a file that gets uploaded to version
control, but Lime doesn't really need to worry about that.

Granted, Lime DID use local.properties, but that's no longer practical.
This commit is contained in:
Joseph Cloutier
2021-11-09 20:08:01 -05:00
parent 80b9b89908
commit fa7f487595
3 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
templates/android/template/app/build.gradle
View File

@@ -10,6 +10,7 @@ System.setProperty('java.awt.headless','false')
android { android {
compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION) compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION)
buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION
::if (ANDROID_GRADLE_PLUGIN>="4.0")::ndkPath '::ANDROID_NDK_ROOT_ESCAPED::'::end::
defaultConfig { defaultConfig {
applicationId "::META_PACKAGE_NAME::" applicationId "::META_PACKAGE_NAME::"

1
templates/android/template/build.gradle
View File

@@ -46,6 +46,7 @@ configure(subprojects.findAll {!it.file('build.gradle').exists() && it.file('bui
android { android {
compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION) compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION)
buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION
::if (ANDROID_GRADLE_PLUGIN>="4.0")::ndkPath '::ANDROID_NDK_ROOT_ESCAPED::'::end::
sourceSets { sourceSets {
main { main {

2
templates/android/template/local.properties
View File

@@ -4,4 +4,6 @@
# Location of the SDK. This is only used by Gradle. # Location of the SDK. This is only used by Gradle.
# #
sdk.dir=::ANDROID_SDK_ESCAPED:: sdk.dir=::ANDROID_SDK_ESCAPED::
::if (ANDROID_GRADLE_PLUGIN<"4.0")::
ndk.dir=::ANDROID_NDK_ROOT_ESCAPED:: ndk.dir=::ANDROID_NDK_ROOT_ESCAPED::
::end::