diff options
| author | earthdok <earthdok@chromium.org> | 2015-03-23 10:56:20 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-23 17:56:54 +0000 |
| commit | 6b777d77c3e23bf7ccf8f4fe2aa47874a435c631 (patch) | |
| tree | 2fd23593bc7954b9f7d8001cf73fc2f924295178 /third_party/instrumented_libraries/instrumented_libraries.gyp | |
| parent | 69b5fc8fc036b5ade5e1498d368ef5c49fb74e48 (diff) | |
| download | chromium_src-6b777d77c3e23bf7ccf8f4fe2aa47874a435c631.zip chromium_src-6b777d77c3e23bf7ccf8f4fe2aa47874a435c631.tar.gz chromium_src-6b777d77c3e23bf7ccf8f4fe2aa47874a435c631.tar.bz2 | |
Revert of Instrumented libraries: add a target for pre-built libraries. (patchset #2 id:20001 of https://codereview.chromium.org/1017053003/)
Reason for revert:
Broke tree.
Original issue's description:
> Instrumented libraries: add a target for pre-built libraries.
>
> With use_prebuilt_instrumented_libraries=1 in GYP_DEFINES, binaries are now
> unpacked from archive and placed into output dir.
>
> BUG=462636
> R=glider@chromium.org
> TBR=thakis@chromium.org
> NOTRY=true
>
> Committed: https://crrev.com/744256e2f3933feaa05c967541afac36825056fa
> Cr-Commit-Position: refs/heads/master@{#321804}
TBR=glider@chromium.org,thakis@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=462636
Review URL: https://codereview.chromium.org/1029103003
Cr-Commit-Position: refs/heads/master@{#321806}
Diffstat (limited to 'third_party/instrumented_libraries/instrumented_libraries.gyp')
| -rw-r--r-- | third_party/instrumented_libraries/instrumented_libraries.gyp | 55 |
1 files changed, 1 insertions, 54 deletions
diff --git a/third_party/instrumented_libraries/instrumented_libraries.gyp b/third_party/instrumented_libraries/instrumented_libraries.gyp index 2d61a3b..28fa65f 100644 --- a/third_party/instrumented_libraries/instrumented_libraries.gyp +++ b/third_party/instrumented_libraries/instrumented_libraries.gyp @@ -82,57 +82,6 @@ 'targets': [ { - 'target_name': 'prebuilt_instrumented_libraries', - 'type': 'none', - 'variables': { - 'prune_self_dependency': 1, - # Don't add this target to the dependencies of targets with type=none. - 'link_dependency': 1, - 'conditions': [ - ['msan==1', { - 'conditions': [ - ['msan_track_origins==2', { - 'archive_name': 'msan-chained-origins-<(_ubuntu_release)', - }, { - 'archive_name': 'UNSUPPORTED_CONFIGURATION' - }], - ]}, { - 'archive_name': 'UNSUPPORTED_CONFIGURATION' - }], - ], - }, - 'actions': [ - { - 'action_name': 'unpack_<(archive_name).tgz', - 'inputs': [ - 'binaries/<(archive_name).tgz', - ], - 'outputs': [ - '<(PRODUCT_DIR)/instrumented_libraries_prebuilt/<(archive_name).txt', - ], - 'action': [ - 'scripts/unpack_binaries.sh', - 'binaries/<(archive_name).tgz', - '<(PRODUCT_DIR)/instrumented_libraries_prebuilt/', - '<(PRODUCT_DIR)/instrumented_libraries_prebuilt/<(archive_name).txt', - ], - }, - ], - 'direct_dependent_settings': { - 'target_conditions': [ - ['_toolset=="target"', { - 'ldflags': [ - # Add a relative RPATH entry to Chromium binaries. This puts - # instrumented DSOs before system-installed versions in library - # search path. - '-Wl,-R,\$$ORIGIN/instrumented_libraries_prebuilt/<(_sanitizer_type)/<(_libdir)/', - '-Wl,-z,origin', - ], - }], - ], - }, - }, - { 'target_name': 'instrumented_libraries', 'type': 'none', 'variables': { @@ -225,9 +174,7 @@ 'target_conditions': [ ['_toolset=="target"', { 'ldflags': [ - # Add a relative RPATH entry to Chromium binaries. This puts - # instrumented DSOs before system-installed versions in library - # search path. + # Add RPATH to result binary to make it linking instrumented libraries ($ORIGIN means relative RPATH) '-Wl,-R,\$$ORIGIN/instrumented_libraries/<(_sanitizer_type)/<(_libdir)/', '-Wl,-z,origin', ], |