diff options
| author | Egor <egor.yusov@gmail.com> | 2018-02-17 23:18:12 +0000 |
|---|---|---|
| committer | Egor <egor.yusov@gmail.com> | 2018-02-17 23:18:12 +0000 |
| commit | aa85da51629079aa8413dbf2534d1040c4dc5fe5 (patch) | |
| tree | 335c74a798710d4208e7dbd1f8ebe6c9f8977617 | |
| parent | Fixed minor issue in ShaderConverterTest (diff) | |
| download | DiligentEngine-aa85da51629079aa8413dbf2534d1040c4dc5fe5.tar.gz DiligentEngine-aa85da51629079aa8413dbf2534d1040c4dc5fe5.zip | |
Moved common gradle build settings to android_common.gradle
| -rw-r--r-- | Common/NativeApp/Android/android_common.gradle | 13 | ||||
| -rw-r--r-- | Common/NativeApp/Android/build.gradle | 9 | ||||
| m--------- | DiligentSamples | 0 | ||||
| -rw-r--r-- | Tests/Android/TestApp/build.gradle | 5 | ||||
| -rw-r--r-- | unityplugin/Android/GhostCubeScene/build.gradle | 5 |
5 files changed, 16 insertions, 16 deletions
diff --git a/Common/NativeApp/Android/android_common.gradle b/Common/NativeApp/Android/android_common.gradle new file mode 100644 index 0000000..dab09c6 --- /dev/null +++ b/Common/NativeApp/Android/android_common.gradle @@ -0,0 +1,13 @@ +android { + compileSdkVersion=27 + + defaultConfig { + minSdkVersion 21 + targetSdkVersion 25 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + } +} + diff --git a/Common/NativeApp/Android/build.gradle b/Common/NativeApp/Android/build.gradle index 857533b..05eb9ef 100644 --- a/Common/NativeApp/Android/build.gradle +++ b/Common/NativeApp/Android/build.gradle @@ -1,15 +1,8 @@ apply plugin: 'com.android.library' +apply from: "android_common.gradle" android { - compileSdkVersion=27 - defaultConfig { - minSdkVersion 21 - targetSdkVersion 25 - versionCode 1 - versionName "1.0" - - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" ndk { abiFilters 'armeabi-v7a'//, 'armeabi', 'arm64-v8a','x86', 'x86_64' diff --git a/DiligentSamples b/DiligentSamples -Subproject 9f511ff74bb6eadc836202c9cb4a5da0152c838 +Subproject e184c84b0816fd35066c8d55c52a07761cf20b5 diff --git a/Tests/Android/TestApp/build.gradle b/Tests/Android/TestApp/build.gradle index 41ffac1..3217c6c 100644 --- a/Tests/Android/TestApp/build.gradle +++ b/Tests/Android/TestApp/build.gradle @@ -1,12 +1,9 @@ apply plugin: 'com.android.application' +apply from: "../../../Common/NativeApp/Android/android_common.gradle" android { - compileSdkVersion=27 - defaultConfig { applicationId = 'com.diligentengine.testapp' - minSdkVersion 21 - targetSdkVersion 25 } buildTypes { release { diff --git a/unityplugin/Android/GhostCubeScene/build.gradle b/unityplugin/Android/GhostCubeScene/build.gradle index 319cd99..d468171 100644 --- a/unityplugin/Android/GhostCubeScene/build.gradle +++ b/unityplugin/Android/GhostCubeScene/build.gradle @@ -1,12 +1,9 @@ apply plugin: 'com.android.application' +apply from: "../../../Common/NativeApp/Android/android_common.gradle" android { - compileSdkVersion = 27 - defaultConfig { applicationId = 'com.diligentengine.unityemulator.ghostcubescene.GhostCubeSceneApplication' - minSdkVersion 21 - targetSdkVersion 25 } buildTypes { release { |