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

Side by Side Diff: base/BUILD.gn

Issue 1535863002: Only set -rpath=$ORIGIN in component builds by default. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2564
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 1544 matching lines...) Expand 10 before | Expand all | Expand 10 after
1555 "strings/sys_string_conversions_mac_unittest.mm", 1555 "strings/sys_string_conversions_mac_unittest.mm",
1556 ] 1556 ]
1557 set_sources_assignment_filter(sources_assignment_filter) 1557 set_sources_assignment_filter(sources_assignment_filter)
1558 1558
1559 # TODO(GYP): dep on copy_test_data_ios action. 1559 # TODO(GYP): dep on copy_test_data_ios action.
1560 } 1560 }
1561 1561
1562 if (is_linux) { 1562 if (is_linux) {
1563 sources -= [ "file_version_info_unittest.cc" ] 1563 sources -= [ "file_version_info_unittest.cc" ]
1564 sources += [ "nix/xdg_util_unittest.cc" ] 1564 sources += [ "nix/xdg_util_unittest.cc" ]
1565
1565 deps += [ "//base/test:malloc_wrapper" ] 1566 deps += [ "//base/test:malloc_wrapper" ]
1566 1567
1567 if (use_glib) { 1568 if (use_glib) {
1568 configs += [ "//build/config/linux:glib" ] 1569 configs += [ "//build/config/linux:glib" ]
1569 } 1570 }
1571
1572 if (!is_component_build) {
1573 # Set rpath to find libmalloc_wrapper.so even in a non-component build.
1574 configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
1575 }
1570 } 1576 }
1571 1577
1572 if (!is_linux || use_ozone) { 1578 if (!is_linux || use_ozone) {
1573 sources -= [ "message_loop/message_pump_glib_unittest.cc" ] 1579 sources -= [ "message_loop/message_pump_glib_unittest.cc" ]
1574 } 1580 }
1575 1581
1576 if (is_posix && !is_ios) { 1582 if (is_posix && !is_ios) {
1577 sources += [ "message_loop/message_pump_libevent_unittest.cc" ] 1583 sources += [ "message_loop/message_pump_libevent_unittest.cc" ]
1578 deps += [ "//third_party/libevent" ] 1584 deps += [ "//third_party/libevent" ]
1579 } 1585 }
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
1744 1750
1745 # GYP: //base.gyp:base_java_unittest_support 1751 # GYP: //base.gyp:base_java_unittest_support
1746 android_library("base_java_unittest_support") { 1752 android_library("base_java_unittest_support") {
1747 deps = [ 1753 deps = [
1748 ":base_java", 1754 ":base_java",
1749 ] 1755 ]
1750 java_files = 1756 java_files =
1751 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] 1757 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ]
1752 } 1758 }
1753 } 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