diff --git a/templates/android/template/app/src/main/AndroidManifest.xml b/templates/android/template/app/src/main/AndroidManifest.xml index af4261bf95..3e44b884ca 100644 --- a/templates/android/template/app/src/main/AndroidManifest.xml +++ b/templates/android/template/app/src/main/AndroidManifest.xml @@ -7,7 +7,7 @@ ::if (ANDROID_PERMISSIONS != null)::::foreach ANDROID_PERMISSIONS:: ::end::::end:: - =30):: android:allowNativeHeapPointerTagging="false" ::end::> + =30):: android:allowNativeHeapPointerTagging="false" ::end::> ::if (WIN_ORIENTATION=="portrait"):: diff --git a/tools/platforms/AndroidPlatform.hx b/tools/platforms/AndroidPlatform.hx index 9372437ee2..7bffb5d23b 100644 --- a/tools/platforms/AndroidPlatform.hx +++ b/tools/platforms/AndroidPlatform.hx @@ -464,8 +464,6 @@ class AndroidPlatform extends PlatformTarget context.ANDROID_USE_ANDROIDX = project.config.getString("android.useAndroidX", "true"); context.ANDROID_ENABLE_JETIFIER = project.config.getString("android.enableJetifier", "false"); - context.ANDROID_LIBRARY_PROJECTS = []; - if (!project.environment.exists("ANDROID_SDK") || !project.environment.exists("ANDROID_NDK_ROOT")) { var command = #if lime "lime" #else "hxp" #end; @@ -476,6 +474,11 @@ class AndroidPlatform extends PlatformTarget Sys.exit(1); } + if (project.config.exists("android.appCategory")) + { + context.ANDROID_APP_CATEGORY = project.config.getString("android.appCategory"); + } + if (project.config.exists("android.gradle-build-directory")) { context.ANDROID_GRADLE_BUILD_DIRECTORY = project.config.getString("android.gradle-build-directory"); @@ -500,6 +503,7 @@ class AndroidPlatform extends PlatformTarget "KEY_STORE_ALIAS_PASSWORD")) context.KEY_STORE_ALIAS_PASSWORD = StringTools.replace(context.KEY_STORE_ALIAS_PASSWORD, "\\", "\\\\"); var index = 1; + context.ANDROID_LIBRARY_PROJECTS = []; for (dependency in project.dependencies) {