parent
c8318012a8
commit
cd2b2bf8bf
|
@ -83,6 +83,7 @@ android {
|
|||
packagingOptions {
|
||||
exclude 'META-INF/LICENSE'
|
||||
exclude 'META-INF/NOTICE'
|
||||
doNotStrip '**/*.so'
|
||||
}
|
||||
|
||||
// Both signing and zip-aligning will be done at export time
|
||||
|
|
|
@ -24,7 +24,7 @@ ext {
|
|||
sconsExt = org.gradle.internal.os.OperatingSystem.current().isWindows() ? ".bat" : ""
|
||||
|
||||
supportedAbis = ["armv7", "arm64v8", "x86", "x86_64"]
|
||||
supportedTargets = ['release': "release", 'debug': "release_debug"]
|
||||
supportedTargets = ["release", "debug"]
|
||||
|
||||
// Used by gradle to specify which architecture to build for by default when running `./gradlew build`.
|
||||
// This command is usually used by Android Studio.
|
||||
|
@ -135,14 +135,14 @@ task zipCustomBuild(type: Zip) {
|
|||
*/
|
||||
task generateGodotTemplates(type: GradleBuild) {
|
||||
// We exclude these gradle tasks so we can run the scons command manually.
|
||||
for (String buildType : supportedTargets.keySet()) {
|
||||
for (String buildType : supportedTargets) {
|
||||
startParameter.excludedTaskNames += ":lib:" + getSconsTaskName(buildType)
|
||||
}
|
||||
|
||||
tasks = ["copyGodotPaymentPluginToAppModule"]
|
||||
|
||||
// Only build the apks and aar files for which we have native shared libraries.
|
||||
for (String target : supportedTargets.keySet()) {
|
||||
for (String target : supportedTargets) {
|
||||
File targetLibs = new File("lib/libs/" + target)
|
||||
if (targetLibs != null
|
||||
&& targetLibs.isDirectory()
|
||||
|
|
|
@ -25,6 +25,7 @@ android {
|
|||
packagingOptions {
|
||||
exclude 'META-INF/LICENSE'
|
||||
exclude 'META-INF/NOTICE'
|
||||
doNotStrip '**/*.so'
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
|
@ -55,7 +56,7 @@ android {
|
|||
// files is only setup for editing support.
|
||||
gradle.startParameter.excludedTaskNames += taskPrefix + "externalNativeBuild" + buildType
|
||||
|
||||
def releaseTarget = supportedTargets[buildType.toLowerCase()]
|
||||
def releaseTarget = buildType.toLowerCase()
|
||||
if (releaseTarget == null || releaseTarget == "") {
|
||||
throw new GradleException("Invalid build type: " + buildType)
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue