mirror of https://github.com/M66B/NetGuard.git
Add all product flavor
This commit is contained in:
parent
42a25a5bd5
commit
01effde621
116
app/app.iml
116
app/app.iml
|
@ -8,12 +8,12 @@
|
||||||
</facet>
|
</facet>
|
||||||
<facet type="android" name="Android">
|
<facet type="android" name="Android">
|
||||||
<configuration>
|
<configuration>
|
||||||
<option name="SELECTED_BUILD_VARIANT" value="lollipop-and-laterDebug" />
|
<option name="SELECTED_BUILD_VARIANT" value="allDebug" />
|
||||||
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
|
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
|
||||||
<option name="ASSEMBLE_TASK_NAME" value="assembleLollipop-and-laterDebug" />
|
<option name="ASSEMBLE_TASK_NAME" value="assembleAllDebug" />
|
||||||
<option name="COMPILE_JAVA_TASK_NAME" value="compileLollipop-and-laterDebugSources" />
|
<option name="COMPILE_JAVA_TASK_NAME" value="compileAllDebugSources" />
|
||||||
<afterSyncTasks>
|
<afterSyncTasks>
|
||||||
<task>generateLollipop-and-laterDebugSources</task>
|
<task>generateAllDebugSources</task>
|
||||||
</afterSyncTasks>
|
</afterSyncTasks>
|
||||||
<option name="ALLOW_USER_CONFIGURATION" value="false" />
|
<option name="ALLOW_USER_CONFIGURATION" value="false" />
|
||||||
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
|
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
|
||||||
|
@ -24,62 +24,62 @@
|
||||||
</facet>
|
</facet>
|
||||||
</component>
|
</component>
|
||||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
|
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
|
||||||
<output url="file://$MODULE_DIR$/build/intermediates/classes/lollipop-and-later/debug" />
|
<output url="file://$MODULE_DIR$/build/intermediates/classes/all/debug" />
|
||||||
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/lollipop-and-later/debug" />
|
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/all/debug" />
|
||||||
<exclude-output />
|
<exclude-output />
|
||||||
<content url="file://$MODULE_DIR$">
|
<content url="file://$MODULE_DIR$">
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/lollipop-and-later/debug" isTestSource="false" generated="true" />
|
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/all/debug" isTestSource="false" generated="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/lollipop-and-later/debug" isTestSource="false" generated="true" />
|
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/all/debug" isTestSource="false" generated="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/lollipop-and-later/debug" isTestSource="false" generated="true" />
|
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/all/debug" isTestSource="false" generated="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/lollipop-and-later/debug" isTestSource="false" generated="true" />
|
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/all/debug" isTestSource="false" generated="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/lollipop-and-later/debug" type="java-resource" />
|
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/all/debug" type="java-resource" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/lollipop-and-later/debug" type="java-resource" />
|
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/all/debug" type="java-resource" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/lollipop-and-laterDebug/res" type="java-resource" />
|
<sourceFolder url="file://$MODULE_DIR$/src/allDebug/res" type="java-resource" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/lollipop-and-laterDebug/resources" type="java-resource" />
|
<sourceFolder url="file://$MODULE_DIR$/src/allDebug/resources" type="java-resource" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/lollipop-and-laterDebug/assets" type="java-resource" />
|
<sourceFolder url="file://$MODULE_DIR$/src/allDebug/assets" type="java-resource" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/lollipop-and-laterDebug/aidl" isTestSource="false" />
|
<sourceFolder url="file://$MODULE_DIR$/src/allDebug/aidl" isTestSource="false" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/lollipop-and-laterDebug/java" isTestSource="false" />
|
<sourceFolder url="file://$MODULE_DIR$/src/allDebug/java" isTestSource="false" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/lollipop-and-laterDebug/jni" isTestSource="false" />
|
<sourceFolder url="file://$MODULE_DIR$/src/allDebug/jni" isTestSource="false" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/lollipop-and-laterDebug/renderscript" isTestSource="false" />
|
<sourceFolder url="file://$MODULE_DIR$/src/allDebug/renderscript" isTestSource="false" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/lollipop-and-laterDebug/shaders" isTestSource="false" />
|
<sourceFolder url="file://$MODULE_DIR$/src/allDebug/shaders" isTestSource="false" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/lollipop-and-later/debug" isTestSource="true" generated="true" />
|
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/all/debug" isTestSource="true" generated="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/lollipop-and-later/debug" isTestSource="true" generated="true" />
|
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/all/debug" isTestSource="true" generated="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/lollipop-and-later/debug" isTestSource="true" generated="true" />
|
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/all/debug" isTestSource="true" generated="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/lollipop-and-later/debug" isTestSource="true" generated="true" />
|
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/all/debug" isTestSource="true" generated="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/lollipop-and-later/debug" type="java-test-resource" />
|
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/all/debug" type="java-test-resource" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/lollipop-and-later/debug" type="java-test-resource" />
|
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/all/debug" type="java-test-resource" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/testLollipop-and-laterDebug/res" type="java-test-resource" />
|
<sourceFolder url="file://$MODULE_DIR$/src/testAllDebug/res" type="java-test-resource" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/testLollipop-and-laterDebug/resources" type="java-test-resource" />
|
<sourceFolder url="file://$MODULE_DIR$/src/testAllDebug/resources" type="java-test-resource" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/testLollipop-and-laterDebug/assets" type="java-test-resource" />
|
<sourceFolder url="file://$MODULE_DIR$/src/testAllDebug/assets" type="java-test-resource" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/testLollipop-and-laterDebug/aidl" isTestSource="true" />
|
<sourceFolder url="file://$MODULE_DIR$/src/testAllDebug/aidl" isTestSource="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/testLollipop-and-laterDebug/java" isTestSource="true" />
|
<sourceFolder url="file://$MODULE_DIR$/src/testAllDebug/java" isTestSource="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/testLollipop-and-laterDebug/jni" isTestSource="true" />
|
<sourceFolder url="file://$MODULE_DIR$/src/testAllDebug/jni" isTestSource="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/testLollipop-and-laterDebug/rs" isTestSource="true" />
|
<sourceFolder url="file://$MODULE_DIR$/src/testAllDebug/rs" isTestSource="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/testLollipop-and-laterDebug/shaders" isTestSource="true" />
|
<sourceFolder url="file://$MODULE_DIR$/src/testAllDebug/shaders" isTestSource="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/lollipop-and-later/res" type="java-resource" />
|
<sourceFolder url="file://$MODULE_DIR$/src/all/res" type="java-resource" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/lollipop-and-later/resources" type="java-resource" />
|
<sourceFolder url="file://$MODULE_DIR$/src/all/resources" type="java-resource" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/lollipop-and-later/assets" type="java-resource" />
|
<sourceFolder url="file://$MODULE_DIR$/src/all/assets" type="java-resource" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/lollipop-and-later/aidl" isTestSource="false" />
|
<sourceFolder url="file://$MODULE_DIR$/src/all/aidl" isTestSource="false" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/lollipop-and-later/java" isTestSource="false" />
|
<sourceFolder url="file://$MODULE_DIR$/src/all/java" isTestSource="false" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/lollipop-and-later/jni" isTestSource="false" />
|
<sourceFolder url="file://$MODULE_DIR$/src/all/jni" isTestSource="false" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/lollipop-and-later/renderscript" isTestSource="false" />
|
<sourceFolder url="file://$MODULE_DIR$/src/all/renderscript" isTestSource="false" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/lollipop-and-later/shaders" isTestSource="false" />
|
<sourceFolder url="file://$MODULE_DIR$/src/all/shaders" isTestSource="false" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTestLollipop-and-later/res" type="java-test-resource" />
|
<sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/res" type="java-test-resource" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTestLollipop-and-later/resources" type="java-test-resource" />
|
<sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/resources" type="java-test-resource" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTestLollipop-and-later/assets" type="java-test-resource" />
|
<sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/assets" type="java-test-resource" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTestLollipop-and-later/aidl" isTestSource="true" />
|
<sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/aidl" isTestSource="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTestLollipop-and-later/java" isTestSource="true" />
|
<sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/java" isTestSource="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTestLollipop-and-later/jni" isTestSource="true" />
|
<sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/jni" isTestSource="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTestLollipop-and-later/rs" isTestSource="true" />
|
<sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/rs" isTestSource="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTestLollipop-and-later/shaders" isTestSource="true" />
|
<sourceFolder url="file://$MODULE_DIR$/src/androidTestAll/shaders" isTestSource="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/testLollipop-and-later/res" type="java-test-resource" />
|
<sourceFolder url="file://$MODULE_DIR$/src/testAll/res" type="java-test-resource" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/testLollipop-and-later/resources" type="java-test-resource" />
|
<sourceFolder url="file://$MODULE_DIR$/src/testAll/resources" type="java-test-resource" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/testLollipop-and-later/assets" type="java-test-resource" />
|
<sourceFolder url="file://$MODULE_DIR$/src/testAll/assets" type="java-test-resource" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/testLollipop-and-later/aidl" isTestSource="true" />
|
<sourceFolder url="file://$MODULE_DIR$/src/testAll/aidl" isTestSource="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/testLollipop-and-later/java" isTestSource="true" />
|
<sourceFolder url="file://$MODULE_DIR$/src/testAll/java" isTestSource="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/testLollipop-and-later/jni" isTestSource="true" />
|
<sourceFolder url="file://$MODULE_DIR$/src/testAll/jni" isTestSource="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/testLollipop-and-later/rs" isTestSource="true" />
|
<sourceFolder url="file://$MODULE_DIR$/src/testAll/rs" isTestSource="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/testLollipop-and-later/shaders" isTestSource="true" />
|
<sourceFolder url="file://$MODULE_DIR$/src/testAll/shaders" isTestSource="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
|
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
|
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
|
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
|
||||||
|
|
|
@ -54,11 +54,18 @@ model {
|
||||||
}
|
}
|
||||||
|
|
||||||
productFlavors {
|
productFlavors {
|
||||||
|
create("all") {
|
||||||
|
versionName = "2.44"
|
||||||
|
minSdkVersion.apiLevel = 14
|
||||||
|
targetSdkVersion.apiLevel = 24
|
||||||
|
versionCode = 2016072401
|
||||||
|
archivesBaseName = "NetGuard-v$versionName"
|
||||||
|
}
|
||||||
create("lollipop-and-later") {
|
create("lollipop-and-later") {
|
||||||
versionName = "2.44"
|
versionName = "2.44"
|
||||||
minSdkVersion.apiLevel = 20
|
minSdkVersion.apiLevel = 20
|
||||||
targetSdkVersion.apiLevel = 24
|
targetSdkVersion.apiLevel = 24
|
||||||
versionCode = 2016072421
|
versionCode = 2016072411
|
||||||
archivesBaseName = "NetGuard-v$versionName"
|
archivesBaseName = "NetGuard-v$versionName"
|
||||||
}
|
}
|
||||||
create("kitkat-and-earlier") {
|
create("kitkat-and-earlier") {
|
||||||
|
@ -66,7 +73,7 @@ model {
|
||||||
minSdkVersion.apiLevel = 14
|
minSdkVersion.apiLevel = 14
|
||||||
maxSdkVersion = 19
|
maxSdkVersion = 19
|
||||||
targetSdkVersion.apiLevel = 24
|
targetSdkVersion.apiLevel = 24
|
||||||
versionCode = 2016072411
|
versionCode = 2016072421
|
||||||
archivesBaseName = "NetGuard-v$versionName"
|
archivesBaseName = "NetGuard-v$versionName"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue