Hash :
74a76320
Author :
Date :
2018-05-14T09:11:51
Fix libGLESv2 wrong .def file. The GN was including both libGLESv2.def and _autogen. This fixes the GN to only include _autogen, and removes the .def include from the static build target. Bug: angleproject:2476 Change-Id: I2e856e3bbe875bdadd1add4517cef60a11227047 Reviewed-on: https://chromium-review.googlesource.com/1057451 Reviewed-by: Nico Weber <thakis@chromium.org> Reviewed-by: Brandon1 Jones <brandon1.jones@intel.com> Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91
# Copyright (c) 2013 The ANGLE Project Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
{
# Everything below this is duplicated in the GN build. If you change
# anything also change angle/BUILD.gn
'targets':
[
{
'target_name': 'libEGL',
'type': '<(angle_gl_library_type)',
'dependencies':
[
'libGLESv2',
],
'includes':
[
'../gyp/common_defines.gypi',
],
'include_dirs':
[
'.',
'../include',
],
'sources':
[
'libEGL/libEGL.def',
'<@(libegl_sources)',
],
'conditions':
[
['angle_build_winrt==1',
{
'msvs_requires_importlibrary' : 'true',
}],
['OS=="win"', {
'defines':
[
'EGLAPI=',
],
}, {
'defines':
[
'EGLAPI=__attribute__((visibility("default")))',
],
}],
['OS == "mac"',
{
'xcode_settings':
{
'DYLIB_INSTALL_NAME_BASE': '@rpath',
},
}],
],
},
{
'target_name': 'libEGL_static',
'type': 'static_library',
'dependencies':
[
'libGLESv2_static',
],
'includes':
[
'../gyp/common_defines.gypi',
],
'include_dirs':
[
'.',
'../include',
],
'sources':
[
'<@(libegl_sources)',
],
'defines':
[
'EGLAPI=',
],
'direct_dependent_settings':
{
'defines':
[
'EGLAPI=',
],
},
},
],
}