Make Android build optional on Nix #31231
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I want to build Servo on NixOS, without installing the non-free Android SDK. This PR makes it so Android support is only built if the
buildAndroidargument is true (e.g. by runningnix-shell --arg buildAndroid true etc/shell.nix)I've verified that you can still build/run non-Android Servo with this change, but I haven't tested on Android (it should still work though, since the derivation is unaffected by this change when
buildAndroidis true)../mach build -ddoes not report any errors./mach test-tidydoes not report any errors - it reports a diff incomponents/config/prefs.rs, which this PR didn't change (I think Document media configs from prefs #31223 caused this by adding a trailing space?)