dmuratshin 9 years ago
parent
commit
26ebd2e60f
3 changed files with 12 additions and 10 deletions
  1. 2 0
      .gitignore
  2. 3 3
      oxygine/SDL/android/extension/build.gradle
  3. 7 7
      oxygine/SDL/android/lib/build.gradle

+ 2 - 0
.gitignore

@@ -62,3 +62,5 @@ build
 /examples/Demo/proj.cmake/mingw
 **/proj.marmalade/build_demo_vc*
 .DS_Store
+*.VC.db
+*.VC.VC.opendb

+ 3 - 3
oxygine/SDL/android/extension/build.gradle

@@ -10,9 +10,9 @@ buildscript {
 apply plugin: 'com.android.library'
 
 android {
-        compileSdkVersion 23
-  		buildToolsVersion '23.0.3'
-
+        compileSdkVersion rootProject.android.compileSdkVersion
+        buildToolsVersion rootProject.android.buildToolsVersion
+        
         sourceSets {
             main {
                 manifest.srcFile 'AndroidManifest.xml'

+ 7 - 7
oxygine/SDL/android/lib/build.gradle

@@ -11,17 +11,17 @@ apply plugin: 'com.android.library'
 
 dependencies {
         compile project(':oxygine-extension')
-    }
+}
 
 android {
-		lintOptions {
-        	abortOnError false
-    	}
+        lintOptions {
+            abortOnError false
+        }
 
-        compileSdkVersion 23
-  		buildToolsVersion '23.0.2'
+        compileSdkVersion rootProject.android.compileSdkVersion
+        buildToolsVersion rootProject.android.buildToolsVersion
 
-  		sourceSets {
+        sourceSets {
             main {
                 manifest.srcFile 'AndroidManifest.xml'
                 java.srcDirs = ['src']