Skip to content

Add a property for skipping Android subprojects. #1485

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
prbprbprb wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −2
Open

Add a property for skipping Android subprojects. #1485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
android.useAndroidX=true
# Set to false in $HOME/.gradle/gradle.properties (or pass -Pconscrypt.includeAndroid=false)
# to exclude Android sub-projects, e.g. when iterating on common/ code.
conscrypt.includeAndroid=true
7 changes: 5 additions & 2 deletions settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ dependencyResolutionManagement {
}

rootProject.name = "conscrypt"
if (System.env.ANDROID_HOME && file(System.env.ANDROID_HOME).exists()) {
if (providers.gradleProperty('conscrypt.includeAndroid').getOrElse('true').toBoolean()
&& System.env.ANDROID_HOME && file(System.env.ANDROID_HOME).exists()) {
include ":conscrypt-android"
include ":conscrypt-android-platform"
include ":conscrypt-android-stub"
Expand All @@ -27,7 +28,9 @@ if (System.env.ANDROID_HOME && file(System.env.ANDROID_HOME).exists()) {
project(':conscrypt-benchmark-android').projectDir = "$rootDir/benchmark-android" as File
project(':conscrypt-libcore-stub').projectDir = "$rootDir/libcore-stub" as File
} else {
logger.warn('Android SDK has not been detected. Skipping Android projects.')
logger.warn('Android projects not included. ' +
'Ensure ANDROID_HOME is set and set conscrypt.includeAndroid=true ' +
'in gradle.properties to include them.')
}

include ":conscrypt-api-doclet"
Expand Down