diff --git a/app/build.gradle b/app/build.gradle index af6ae9e9..394eadd5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,6 +16,19 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + flavorDimensions 'mode' + productFlavors { + normal { + dimension 'mode' + } + playstore { + dimension 'mode' + } + embed { + dimension 'mode' + applicationIdSuffix "embed" + } + } lintOptions { abortOnError false } diff --git a/app/src/embed/AndroidManifest.xml b/app/src/embed/AndroidManifest.xml new file mode 100644 index 00000000..263a4429 --- /dev/null +++ b/app/src/embed/AndroidManifest.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e46fae1d..cf3efa72 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,7 +3,7 @@ android:installLocation="auto" xmlns:android="http://schemas.android.com/apk/res/android"> - + diff --git a/app/src/normal/AndroidManifest.xml b/app/src/normal/AndroidManifest.xml new file mode 100644 index 00000000..2398d67c --- /dev/null +++ b/app/src/normal/AndroidManifest.xml @@ -0,0 +1,2 @@ + + diff --git a/app/src/playstore/AndroidManifest.xml b/app/src/playstore/AndroidManifest.xml new file mode 100644 index 00000000..fd60270d --- /dev/null +++ b/app/src/playstore/AndroidManifest.xml @@ -0,0 +1,8 @@ + + + + diff --git a/love/build.gradle b/love/build.gradle index 83d20654..2d586d85 100644 --- a/love/build.gradle +++ b/love/build.gradle @@ -13,6 +13,7 @@ android { compileSdkVersion 28 buildToolsVersion "28.0.3" minSdkVersion 14 + resValue "bool", "embed", "false" externalNativeBuild { ndkBuild { arguments "-j4" @@ -30,12 +31,31 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + flavorDimensions 'mode' + productFlavors { + normal { + dimension 'mode' + } + playstore { + dimension 'mode' + } + embed { + dimension 'mode' + resValue "bool", "embed", "true" + } + } sourceSets { main { java { srcDirs('src/main/java', 'src/jni/SDL2/android-project/app/src/main/java') } } + embed { + java { + exclude '**/DownloadActivity.java' + exclude '**/DownloadService.java' + } + } } externalNativeBuild { ndkBuild {