servo: Merge #19161 - remove unused script in `build_commands.py` (from tigercosmos:python2); r=emilio
authortigercosmos <b04209032@ntu.edu.tw>
Thu, 09 Nov 2017 05:57:43 -0600
changeset 444221 b9d38c74d5ffdb4353f36ad10a65681d492d340c
parent 444220 818860c42bcaa778c3c88bec897bc7bb1f417f3b
child 444222 cf6c386ae59c4d5a8120eddaf06e69ba6996dc49
push id1618
push userCallek@gmail.com
push dateThu, 11 Jan 2018 17:45:48 +0000
treeherdermozilla-release@882ca853e05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersemilio
milestone58.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
servo: Merge #19161 - remove unused script in `build_commands.py` (from tigercosmos:python2); r=emilio <!-- 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) https://github.com/servo/servo/blob/ae5dca985ee58fbcd18d7e470184beb2b7e3d547/python/servo/build_commands.py#L268 https://github.com/servo/servo/blob/ae5dca985ee58fbcd18d7e470184beb2b7e3d547/support/android/openssl.makefile#L9-L10 https://github.com/servo/servo/blob/ae5dca985ee58fbcd18d7e470184beb2b7e3d547/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. --> Source-Repo: https://github.com/servo/servo Source-Revision: 1d6b8a5448f4a7b55e224b4d1fd4520b74095864
servo/python/servo/build_commands.py
--- a/servo/python/servo/build_commands.py
+++ b/servo/python/servo/build_commands.py
@@ -260,17 +260,16 @@ class MachCommands(CommandBase):
             android_dir = self.android_build_dir(dev)
             openssl_dir = path.join(android_dir, "native", "openssl")
             if not path.exists(openssl_dir):
                 os.makedirs(openssl_dir)
             shutil.copy(path.join(self.android_support_dir(), "openssl.makefile"), openssl_dir)
             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':
                     print("Currently only support NDK 12.")
                     sys.exit(1)
 
             env["RUST_TARGET"] = target
             with cd(openssl_dir):