Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(35)

Side by Side Diff: base/BUILD.gn

Issue 1525733002: Revert of Only set -rpath=$ORIGIN in component builds by default. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | build/config/gcc/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/compiler/compiler.gni") 5 import("//build/config/compiler/compiler.gni")
6 import("//build/config/nacl/config.gni") 6 import("//build/config/nacl/config.gni")
7 import("//build/config/ui.gni") 7 import("//build/config/ui.gni")
8 import("//testing/test.gni") 8 import("//testing/test.gni")
9 9
10 if (is_android) { 10 if (is_android) {
(...skipping 1546 matching lines...) Expand 10 before | Expand all | Expand 10 after
1557 "strings/sys_string_conversions_mac_unittest.mm", 1557 "strings/sys_string_conversions_mac_unittest.mm",
1558 ] 1558 ]
1559 set_sources_assignment_filter(sources_assignment_filter) 1559 set_sources_assignment_filter(sources_assignment_filter)
1560 1560
1561 # TODO(GYP): dep on copy_test_data_ios action. 1561 # TODO(GYP): dep on copy_test_data_ios action.
1562 } 1562 }
1563 1563
1564 if (is_linux) { 1564 if (is_linux) {
1565 sources -= [ "file_version_info_unittest.cc" ] 1565 sources -= [ "file_version_info_unittest.cc" ]
1566 sources += [ "nix/xdg_util_unittest.cc" ] 1566 sources += [ "nix/xdg_util_unittest.cc" ]
1567
1568 deps += [ "//base/test:malloc_wrapper" ] 1567 deps += [ "//base/test:malloc_wrapper" ]
1569 1568
1570 if (use_glib) { 1569 if (use_glib) {
1571 configs += [ "//build/config/linux:glib" ] 1570 configs += [ "//build/config/linux:glib" ]
1572 } 1571 }
1573
1574 if (!is_component_build) {
1575 # Set rpath to find libmalloc_wrapper.so even in a non-component build.
1576 configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
1577 }
1578 } 1572 }
1579 1573
1580 if (!is_linux || use_ozone) { 1574 if (!is_linux || use_ozone) {
1581 sources -= [ "message_loop/message_pump_glib_unittest.cc" ] 1575 sources -= [ "message_loop/message_pump_glib_unittest.cc" ]
1582 } 1576 }
1583 1577
1584 if (is_posix && !is_ios) { 1578 if (is_posix && !is_ios) {
1585 sources += [ "message_loop/message_pump_libevent_unittest.cc" ] 1579 sources += [ "message_loop/message_pump_libevent_unittest.cc" ]
1586 deps += [ "//third_party/libevent" ] 1580 deps += [ "//third_party/libevent" ]
1587 } 1581 }
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
1756 1750
1757 # GYP: //base.gyp:base_java_unittest_support 1751 # GYP: //base.gyp:base_java_unittest_support
1758 android_library("base_java_unittest_support") { 1752 android_library("base_java_unittest_support") {
1759 deps = [ 1753 deps = [
1760 ":base_java", 1754 ":base_java",
1761 ] 1755 ]
1762 java_files = 1756 java_files =
1763 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] 1757 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ]
1764 } 1758 }
1765 } 1759 }
OLDNEW
« no previous file with comments | « no previous file | build/config/gcc/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698