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

Side by Side Diff: third_party/mesa/BUILD.gn

Issue 2879373002: Revert of mesa: Disable support for loading libtxc_dxtn.so if msan is enabled. (Closed)
Patch Set: Created 3 years, 7 months 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 | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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/ui.gni") 5 import("//build/config/ui.gni")
6 import("//build/config/compiler/compiler.gni") 6 import("//build/config/compiler/compiler.gni")
7 import("//build/config/sanitizers/sanitizers.gni") 7 import("//build/config/sanitizers/sanitizers.gni")
8 8
9 config("mesa_headers_config") { 9 config("mesa_headers_config") {
10 include_dirs = [ "src/include" ] 10 include_dirs = [ "src/include" ]
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 "HAVE_LIBEXPAT=1", 52 "HAVE_LIBEXPAT=1",
53 "HAVE_LIBXCB_DRI2=1", 53 "HAVE_LIBXCB_DRI2=1",
54 "FEATURE_GL=1", 54 "FEATURE_GL=1",
55 "MAPI_MODE_GLAPI", 55 "MAPI_MODE_GLAPI",
56 56
57 #"USE_X86_64_ASM", 57 #"USE_X86_64_ASM",
58 "IN_DRI_DRIVER", 58 "IN_DRI_DRIVER",
59 "USE_XCB", 59 "USE_XCB",
60 "GLX_INDIRECT_RENDERING", 60 "GLX_INDIRECT_RENDERING",
61 "GLX_DIRECT_RENDERING", 61 "GLX_DIRECT_RENDERING",
62 "USE_EXTERNAL_DXTN_LIB=1",
62 "IN_DRI_DRIVER", 63 "IN_DRI_DRIVER",
63 "HAVE_ALIAS", 64 "HAVE_ALIAS",
64 "HAVE_MINCORE", 65 "HAVE_MINCORE",
65 "HAVE_LIBUDEV", 66 "HAVE_LIBUDEV",
66 "_GLAPI_NO_EXPORTS", 67 "_GLAPI_NO_EXPORTS",
67 ] 68 ]
68 include_dirs = [ 69 include_dirs = [
69 "src/src/gallium/auxiliary", 70 "src/src/gallium/auxiliary",
70 "src/src/gallium/include", 71 "src/src/gallium/include",
71 "src/src/glsl", 72 "src/src/glsl",
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 ] 107 ]
107 108
108 if (!is_android) { 109 if (!is_android) {
109 defines += [ "HAVE_POSIX_MEMALIGN" ] 110 defines += [ "HAVE_POSIX_MEMALIGN" ]
110 } 111 }
111 112
112 if (!is_android && !is_mac) { 113 if (!is_android && !is_mac) {
113 cflags += [ "-fPIC" ] 114 cflags += [ "-fPIC" ]
114 } 115 }
115 } 116 }
116
117 if (is_msan) {
118 # Disable code in mesa that loads the libtxc_dxtn.so library if msan is
119 # enabled, as the library will be loaded from a system directory, which
120 # may cause spurious msan reports because msan expects most libraries in
121 # the process to be compiled with msan.
122 defines += [ "USE_EXTERNAL_DXTN_LIB=0" ]
123 }
124 } 117 }
125 118
126 # mesa_internal_config is prepended to the config lists. Flags that 119 # mesa_internal_config is prepended to the config lists. Flags that
127 # disable warnings need to be appended instead so that they show up 120 # disable warnings need to be appended instead so that they show up
128 # after flags like -Wall. (gn orders flags on a target before flags from 121 # after flags like -Wall. (gn orders flags on a target before flags from
129 # configs.) 122 # configs.)
130 config("mesa_internal_warnings") { 123 config("mesa_internal_warnings") {
131 cflags = [] 124 cflags = []
132 if (is_clang) { 125 if (is_clang) {
133 cflags += [ 126 cflags += [
(...skipping 656 matching lines...) Expand 10 before | Expand all | Expand 10 after
790 deps = [ 783 deps = [
791 "//third_party/wayland:wayland_util", 784 "//third_party/wayland:wayland_util",
792 ] 785 ]
793 786
794 configs -= [ "//build/config/compiler:chromium_code" ] 787 configs -= [ "//build/config/compiler:chromium_code" ]
795 configs += [ "//build/config/compiler:no_chromium_code" ] 788 configs += [ "//build/config/compiler:no_chromium_code" ]
796 789
797 public_configs = [ ":wayland_drm_protocol_config" ] 790 public_configs = [ ":wayland_drm_protocol_config" ]
798 } 791 }
799 } 792 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698