diff options
| author | brettw <brettw@chromium.org> | 2015-03-16 15:14:18 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-16 22:15:03 +0000 |
| commit | 8f2fd17e33f365c1a73dd25aa33a3a2877d0c1d5 (patch) | |
| tree | 22106f2d87ed7e07acab521a2e9f8423944e9f5e /gpu/config | |
| parent | 042582e3d43600e5aa88feffd72ccf48fc2c047f (diff) | |
| download | chromium_src-8f2fd17e33f365c1a73dd25aa33a3a2877d0c1d5.zip chromium_src-8f2fd17e33f365c1a73dd25aa33a3a2877d0c1d5.tar.gz chromium_src-8f2fd17e33f365c1a73dd25aa33a3a2877d0c1d5.tar.bz2 | |
Fix some GN component build issues.
This fixes some files not compiling with the proper flags for component mode.
The device_event_log target in GN is a source set in GN and a component in GYP. This difference was causing some errors. I changed this to be a static library in GYP. It only has 2 files in it so making a whole shared library for this target seems wasteful.
Review URL: https://codereview.chromium.org/1011823002
Cr-Commit-Position: refs/heads/master@{#320805}
Diffstat (limited to 'gpu/config')
| -rw-r--r-- | gpu/config/BUILD.gn | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gpu/config/BUILD.gn b/gpu/config/BUILD.gn index 4d068ed..6139153 100644 --- a/gpu/config/BUILD.gn +++ b/gpu/config/BUILD.gn @@ -45,10 +45,11 @@ source_set("config") { "software_rendering_list_json.cc", ] - # TODO(jschuh): size_t to int. - configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] - - defines = [ "GPU_IMPLEMENTATION" ] + configs += [ + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + "//build/config/compiler:no_size_t_to_int_warning", + "//gpu:gpu_implementation", + ] deps = [ "//base", @@ -74,7 +75,7 @@ source_set("config") { } } if (use_libpci) { - defines += [ "USE_LIBPCI=1" ] + defines = [ "USE_LIBPCI=1" ] } if (is_linux && use_libpci && (use_x11 || use_ozone)) { deps += [ "//build/config/linux:libpci" ] |