Merge "Update language to comply with Android's inclusive language guidance" am: 7ee1f8e6a9 am: 47eeb27cb1

Original change: https://android-review.googlesource.com/c/platform/development/+/1374197

Change-Id: I9c214240aef121ea5eef6d8acaae6569f4cc6965
This commit is contained in:
Hsin-Yi Chen
2020-07-29 03:07:12 +00:00
committed by Automerger Merge Worker
2 changed files with 2 additions and 3 deletions

View File

@@ -1893,7 +1893,7 @@ class VNDKLibDir(list):
if vendor_dirs:
versions.update(collect_versions(vendor_dirs))
# Sanity check: Versions must not be 'sp' or start with 'sp-'.
# Validate: Versions must not be 'sp' or start with 'sp-'.
bad_versions = [version for version in versions
if version == 'sp' or version.startswith('sp-')]
if bad_versions:

View File

@@ -25,8 +25,7 @@ To build `header-abi-dumper`, `header-abi-linker` and `header-abi-diff`:
## Alternative build instructions
If you have a full AOSP master branch source tree, you may build the tools
with:
If you have a full source tree, you may build the tools with:
$ source build/envsetup.sh