We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

Patch file which adds additional gradle project properties.

java-aar.patch (text/plain), 2.26 KB, created by Cole Campbell on 2018-01-10 04:55:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Cole Campbell

Created: 2018-01-10 04:55:08 UTC

Size: 2.26 KB

patch

obsolete

># HG changeset patch
># User Cole Campbell <cole.campbell@twistedlogik.net>
># Date 1515543094 18000
>#      Tue Jan 09 19:11:34 2018 -0500
># Node ID f8be56c48aa0a9f471ed8517e70838ec6e1dd748
># Parent  43bba409e6d26989ee273b945ba3dda10f19ca64
>Allow Android Java shim to be built as an AAR
>
>diff -r 43bba409e6d2 -r f8be56c48aa0 android-project/app/build.gradle
>--- a/android-project/app/build.gradle	Sun Jan 07 22:00:37 2018 -0400
>+++ b/android-project/app/build.gradle	Tue Jan 09 19:11:34 2018 -0500
>@@ -1,10 +1,19 @@
>-apply plugin: 'com.android.application'
>+def buildAsLibrary = project.hasProperty('BUILD_AS_LIBRARY');
>+def buildAsApplication = !buildAsLibrary
>+if (buildAsApplication) {
>+    apply plugin: 'com.android.application'
>+}
>+else {
>+    apply plugin: 'com.android.library'
>+}
> 
> android {
>     compileSdkVersion 16
>     buildToolsVersion "26.0.1"
>     defaultConfig {
>-        applicationId "org.libsdl.app"
>+        if (buildAsApplication) {
>+            applicationId "org.libsdl.app"
>+        }
>         minSdkVersion 14
>         targetSdkVersion 16
>         versionCode 1
>@@ -22,17 +31,32 @@
>             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
>         }
>     }
>-    sourceSets.main {
>-        jniLibs.srcDir 'libs'
>-    }
>-    externalNativeBuild {
>-        ndkBuild {
>-            path 'jni/Android.mk'
>+    if (!project.hasProperty('EXCLUDE_NATIVE_LIBS')) {
>+        sourceSets.main {
>+            jniLibs.srcDir 'libs'
>         }
>+        externalNativeBuild {
>+            ndkBuild {
>+                path 'jni/Android.mk'
>+            }
>+        }
>+       
>     }
>     lintOptions {
>         abortOnError false
>     }
>+    
>+    if (buildAsLibrary) {
>+        libraryVariants.all { variant ->
>+            variant.outputs.each { output ->
>+                def outputFile = output.outputFile
>+                if (outputFile != null && outputFile.name.endsWith(".aar")) {
>+                    def fileName = "org.libsdl.app.aar";
>+                    output.outputFile = new File(outputFile.parent, fileName);
>+                }
>+            }
>+        }
>+    }
> }
> 
> dependencies {
>@@ -41,4 +65,4 @@
>         exclude group: 'com.android.support', module: 'support-annotations'
>     })
>     testCompile 'junit:junit:4.12'
>-}
>+}
>\ No newline at end of file

Actions: View

Attachments on bug 4035: 3128

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.