[email protected] 8 anni fa
parent
commit
efc5242bc5

+ 2 - 2
tools/templates/proj.android/build-run.bat

@@ -1,4 +1,4 @@
-call ndk-build NDK_MODULE_PATH="${ROOT}"
+rem call ndk-build NDK_MODULE_PATH="../../../../"
 call gradlew assembleDebug
-call adb install -r build/outputs/apk/proj.android-debug.apk
+call adb install -r build/outputs/apk/debug/proj.android-debug.apk
 call adb shell am start -n org.oxygine.${PROJECT}/org.oxygine.${PROJECT}.MainActivity

+ 2 - 2
tools/templates/proj.android/build-run.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-ndk-build NDK_MODULE_PATH="${ROOT}"
+#ndk-build NDK_MODULE_PATH="../../../../"
 gradlew assembleDebug
-adb install -r build/outputs/apk/proj.android-debug.apk
+adb install -r build/outputs/apk/debug/proj.android-debug.apk
 adb shell am start -n org.oxygine.${PROJECT}/org.oxygine.${PROJECT}.MainActivity

+ 23 - 6
tools/templates/proj.android/build.gradle

@@ -3,9 +3,10 @@ buildscript {
         mavenLocal()
         mavenCentral()
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.+'
+        classpath 'com.android.tools.build:gradle:3.0.1'
     }
 }
 
@@ -14,15 +15,13 @@ apply plugin: 'com.android.application'
 
 
 dependencies {
-    compile(project(':oxygine-extension'))
-    compile(project(':oxygine-lib')) { exclude module: 'oxygine-extension' }
+    implementation(project(':oxygine-extension'))
+    implementation(project(':oxygine-lib')) { exclude module: 'oxygine-extension' }
 }
 
 android {
-    enforceUniquePackageName=false
         
     compileSdkVersion 23
-    buildToolsVersion '23.0.2'
 
 
     sourceSets {
@@ -35,8 +34,26 @@ android {
         }
     }
 
+    defaultConfig {
+        ndk {
+            abiFilters 'armeabi-v7a', 'arm64-v8a'
+        }
+
+        externalNativeBuild {
+            ndkBuild {
+                arguments 'NDK_MODULE_PATH+=../../../../'
+            }
+        }
+    }
+
+    externalNativeBuild {
+        ndkBuild {
+            path 'jni/Android.mk'
+        }
+    }
+
     aaptOptions {
         noCompress 'zip', 'ogg'
-        ignoreAssetsPattern "!*.dll:*.icf"
+        ignoreAssetsPattern "!*.dll"
     }
 }