mirror of
https://github.com/servo/servo.git
synced 2025-08-06 14:10:11 +01:00
Auto merge of #19161 - tigercosmos:python2, r=emilio
remove unused script in `build_commands.py` <!-- Please describe your changes on the following line: --> code in `build_commands.py` duplicates with `openssl.makefile`, so it is unused. (It only use in openssl)ae5dca985e/python/servo/build_commands.py (L268)
ae5dca985e/support/android/openssl.makefile (L9-L10)
ae5dca985e/support/android/openssl.sh (L83-L84)
--- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [ ] These changes fix #__ (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [ ] These changes do not require tests because _____ <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/19161) <!-- Reviewable:end -->
This commit is contained in:
commit
1d6b8a5448
1 changed files with 0 additions and 1 deletions
|
@ -265,7 +265,6 @@ class MachCommands(CommandBase):
|
|||
shutil.copy(path.join(self.android_support_dir(), "openssl.sh"), openssl_dir)
|
||||
|
||||
# Check if the NDK version is 12
|
||||
env["ANDROID_NDK_ROOT"] = env["ANDROID_NDK"]
|
||||
with open(path.join(env["ANDROID_NDK"], 'source.properties')) as ndk_properties:
|
||||
lines = ndk_properties.readlines()
|
||||
if lines[1].split(' = ')[1].split('.')[0] != '12':
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue