diff options
| author | earthdok <earthdok@chromium.org> | 2014-12-01 12:12:55 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-01 20:13:44 +0000 |
| commit | 6cf8c872bf7d40e3ea015d8555c0422ebecae8a8 (patch) | |
| tree | 6bfcfe113d0e58b9aa13ee674a296a0dcf37a588 /third_party/instrumented_libraries | |
| parent | 8c96df84fdd6d56c7b896d90ee08297659bf27d1 (diff) | |
| download | chromium_src-6cf8c872bf7d40e3ea015d8555c0422ebecae8a8.zip chromium_src-6cf8c872bf7d40e3ea015d8555c0422ebecae8a8.tar.gz chromium_src-6cf8c872bf7d40e3ea015d8555c0422ebecae8a8.tar.bz2 | |
Instrumented libraries: add brltty for ChromeOS.
BUG=419367
TBR=glider@chromium.org
NOTRY=true
Review URL: https://codereview.chromium.org/770013002
Cr-Commit-Position: refs/heads/master@{#306238}
Diffstat (limited to 'third_party/instrumented_libraries')
3 files changed, 30 insertions, 2 deletions
diff --git a/third_party/instrumented_libraries/download_build_install.py b/third_party/instrumented_libraries/download_build_install.py index 73ba2d0..ddaed77 100755 --- a/third_party/instrumented_libraries/download_build_install.py +++ b/third_party/instrumented_libraries/download_build_install.py @@ -96,7 +96,9 @@ def destdir_configure_make_install(parsed_arguments, environment, # files below. destdir = '%s/debian/instrumented_build' % os.getcwd() # Some makefiles use BUILDROOT instead of DESTDIR. - make_command = 'make DESTDIR=%s BUILDROOT=%s' % (destdir, destdir) + make_command = 'make DESTDIR=%s BUILDROOT=%s INSTALL_ROOT=%s' % (destdir, + destdir, + destdir) build_and_install_in_destdir = [ configure_command, '%s -j%s' % (make_command, parsed_arguments.jobs), diff --git a/third_party/instrumented_libraries/install-build-deps.sh b/third_party/instrumented_libraries/install-build-deps.sh index 214fbc6..a7dfb55 100755 --- a/third_party/instrumented_libraries/install-build-deps.sh +++ b/third_party/instrumented_libraries/install-build-deps.sh @@ -63,7 +63,8 @@ overlay-scrollbar \ pango1.0 \ pulseaudio \ udev \ -zlib1g" +zlib1g \ +brltty" precise_specific_packages="libtasn1-3" trusty_specific_packages="\ diff --git a/third_party/instrumented_libraries/instrumented_libraries.gyp b/third_party/instrumented_libraries/instrumented_libraries.gyp index ebb19e6..608caf0 100644 --- a/third_party/instrumented_libraries/instrumented_libraries.gyp +++ b/third_party/instrumented_libraries/instrumented_libraries.gyp @@ -156,6 +156,11 @@ '<(_sanitizer_type)-libpng12-0', ], }], + ['chromeos==1', { + 'dependencies': [ + '<(_sanitizer_type)-brltty', + ], + }] ], 'direct_dependent_settings': { 'target_conditions': [ @@ -668,5 +673,25 @@ 'dependencies=': [], 'includes': ['standard_instrumented_package_target.gypi'], }, + { + 'package_name': 'brltty', + 'extra_configure_flags': [ + # From debian/rules. + '--without-viavoice', + '--without-theta', + '--without-swift', + '--bindir=/sbin', + '--with-curses=ncursesw', + '--disable-stripping', + # We don't need any of those. + '--disable-java-bindings', + '--disable-lisp-bindings', + '--disable-ocaml-bindings', + '--disable-python-bindings', + '--disable-tcl-bindings' + ], + 'dependencies=': [], + 'includes': ['standard_instrumented_package_target.gypi'], + }, ], } |