diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-02-06 08:43:46 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-02-06 08:43:46 +0530 |
| commit | b2a297c64f19ca975202e29151f7780ebccd0ec7 (patch) | |
| tree | aed4a0475620c2c12c16dccc2e1aec1c44806319 | |
| parent | 3498deca39309fe919be203aad9a5f2c0cc6f098 (diff) | |
| parent | 9801552535713018989f3614d3ac0bdf55a76574 (diff) | |
| download | servo-b2a297c64f19ca975202e29151f7780ebccd0ec7.tar.gz servo-b2a297c64f19ca975202e29151f7780ebccd0ec7.zip | |
Auto merge of #9549 - saurvs:master, r=larsbergstrom
Removed references of android-rs-glue from comments and documentation
Fixes https://github.com/servo/servo/issues/9507.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9549)
<!-- Reviewable:end -->
| -rw-r--r-- | ORGANIZATION.md | 2 | ||||
| -rw-r--r-- | python/servo/command_base.py | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/ORGANIZATION.md b/ORGANIZATION.md index d40d71fcdee..68a95d89400 100644 --- a/ORGANIZATION.md +++ b/ORGANIZATION.md @@ -69,8 +69,6 @@ * support * android * Libraries that require special handling for building for Android platforms - * android-rs-glue - * Library to integrate better with Android platforms * rust-task_info * Library for obtaining information about memory usage for a process * target diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 1acf5abd832..450403e903b 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -362,10 +362,10 @@ class CommandBase(object): env["OPENSSL_LIB_DIR"] = openssl_dir env['OPENSSL_INCLUDE_DIR'] = path.join(env["GONKDIR"], "external/openssl/include") - # FIXME: These are set because they are the variable names that - # android-rs-glue expects. However, other submodules have makefiles that - # reference the env var names above. Once glutin is enabled and set as - # the default, we could modify the subproject makefiles to use the names + # These are set because they are the variable names that build-apk + # expects. However, other submodules have makefiles that reference + # the env var names above. Once glutin is enabled and set as the + # default, we could modify the subproject makefiles to use the names # below and remove the vars above, to avoid duplication. if "ANDROID_SDK" in env: env["ANDROID_HOME"] = env["ANDROID_SDK"] |