diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-18 04:19:17 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-18 04:20:26 +0000 |
| commit | 36170e5aa27e6b653e6159ec70e8ca904396d637 (patch) | |
| tree | f5950d04330cf16168eb0f84f7c5d8c495322bc6 /third_party | |
| parent | 5eabacc2da95798c0765b1cb0d8b89325f47d9e1 (diff) | |
| download | chromium_src-36170e5aa27e6b653e6159ec70e8ca904396d637.zip chromium_src-36170e5aa27e6b653e6159ec70e8ca904396d637.tar.gz chromium_src-36170e5aa27e6b653e6159ec70e8ca904396d637.tar.bz2 | |
mesa: Don't build mapi.h / mapi.c
We don't need them, and they unconditionally mark their functions as
__declspec(dllimport) in the header in a static library build, which
causes warnings on the clang/win bot.
BUG=82385
R=kbr@chromium.org
Review URL: https://codereview.chromium.org/478153002
Cr-Commit-Position: refs/heads/master@{#290207}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290207 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/mesa/BUILD.gn | 2 | ||||
| -rw-r--r-- | third_party/mesa/README.chromium | 2 | ||||
| -rw-r--r-- | third_party/mesa/mesa.gyp | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/third_party/mesa/BUILD.gn b/third_party/mesa/BUILD.gn index 5c2a85a..62c3387 100644 --- a/third_party/mesa/BUILD.gn +++ b/third_party/mesa/BUILD.gn @@ -257,8 +257,6 @@ static_library("mesa") { "$generated_src_dir/mesa/glapi_mapi_tmp_shared.h", "src/src/mapi/mapi/entry.c", "src/src/mapi/mapi/entry.h", - "src/src/mapi/mapi/mapi.c", - "src/src/mapi/mapi/mapi.h", "src/src/mapi/mapi/mapi_glapi.c", "src/src/mapi/mapi/stub.c", "src/src/mapi/mapi/stub.h", diff --git a/third_party/mesa/README.chromium b/third_party/mesa/README.chromium index bc729c6..9080655 100644 --- a/third_party/mesa/README.chromium +++ b/third_party/mesa/README.chromium @@ -50,3 +50,5 @@ Modifications made: - Porting to x64 Android. Remove redefinitions of log2 and log2f. https://codereview.chromium.org/216773005/ + +- Excluded src/mapi/mapi/mapi.{h,c} from the build. diff --git a/third_party/mesa/mesa.gyp b/third_party/mesa/mesa.gyp index 931c5e0..09d01ec 100644 --- a/third_party/mesa/mesa.gyp +++ b/third_party/mesa/mesa.gyp @@ -283,8 +283,6 @@ '<(generated_src_dir)/mesa/glapi_mapi_tmp_shared.h', 'src/src/mapi/mapi/entry.c', 'src/src/mapi/mapi/entry.h', - 'src/src/mapi/mapi/mapi.c', - 'src/src/mapi/mapi/mapi.h', 'src/src/mapi/mapi/mapi_glapi.c', 'src/src/mapi/mapi/stub.c', 'src/src/mapi/mapi/stub.h', |