diff options
| author | spang <spang@chromium.org> | 2014-08-28 17:32:53 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-08-29 00:33:42 +0000 |
| commit | 94b4625f9c72a61459a27dda17b8e75ad6967311 (patch) | |
| tree | 914e453048159f82b2e5cf8e024fa130ae641cb4 | |
| parent | b7f1a20215d4085fe00559f9f2759d9224786c5a (diff) | |
| download | chromium_src-94b4625f9c72a61459a27dda17b8e75ad6967311.zip chromium_src-94b4625f9c72a61459a27dda17b8e75ad6967311.tar.gz chromium_src-94b4625f9c72a61459a27dda17b8e75ad6967311.tar.bz2 | |
ozone: Whitelist some libs for the embedded build
Also switch harfbuzz to internal by default to minimize deps.
BUG=178543
TEST=run the tool
TBR=bashi1
Review URL: https://codereview.chromium.org/509323004
Cr-Commit-Position: refs/heads/master@{#292521}
| -rw-r--r-- | third_party/harfbuzz-ng/harfbuzz.gyp | 2 | ||||
| -rwxr-xr-x | tools/check_ecs_deps/check_ecs_deps.py | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/third_party/harfbuzz-ng/harfbuzz.gyp b/third_party/harfbuzz-ng/harfbuzz.gyp index 6cfed65..3e6fed4 100644 --- a/third_party/harfbuzz-ng/harfbuzz.gyp +++ b/third_party/harfbuzz-ng/harfbuzz.gyp @@ -20,7 +20,7 @@ 'pkg-config': '<(pkg-config)', 'conditions': [ - ['OS=="linux" and (buildtype!="Official" or chromeos==1)', { + ['OS=="linux" and (buildtype!="Official" or chromeos==1) and embedded==0', { # Since version 1.31.0, pangoft2 which we depend on pulls in harfbuzz # anyways. However, we want to have control of the version of harfbuzz # we use, so don't use system harfbuzz for official builds, unless we diff --git a/tools/check_ecs_deps/check_ecs_deps.py b/tools/check_ecs_deps/check_ecs_deps.py index f6760d6..4ac06bb 100755 --- a/tools/check_ecs_deps/check_ecs_deps.py +++ b/tools/check_ecs_deps/check_ecs_deps.py @@ -39,7 +39,6 @@ kUndesiredLibraryList = [ 'libpcre', 'libpixman', 'libpng', - 'libresolv', 'libselinux', 'libudev', 'libxcb', @@ -53,6 +52,7 @@ kAllowedLibraryList = [ 'libgcc_s', 'libm', 'libpthread', + 'libresolv', 'librt', 'libstdc++', 'linux-vdso', @@ -68,6 +68,9 @@ kAllowedLibraryList = [ 'libplds4', 'libsmime3', + # OpenSSL + 'libcrypto', + # Miscellaneous 'libcap', 'libexpat', |