Skip to content

A
angle
Commit f024f54b by Sylvain Defresne Committed by Commit Bot
Options

Explicitly filter assignments to sources variable

set_sources_assignment_filter() is considered as a mis-feature of gn (as it makes it difficult to reason about the BUILD.gn files individually). Change libGLESv2.gni in angle to check the platform before adding plaform-specific source files to "sources" variable. This will allow removing the global sources assignment filter from Chromium codebase. Bug: chromium:1018739 Change-Id: I5db637a583d9cf547f6f175baa445d47751e6a3c Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2428763Reviewed-by: 's avatarNico Weber <thakis@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 68a5baeb
Showing with 19 additions and 5 deletions
src/libGLESv2.gni
...@@ -536,9 +536,7 @@ libgl_sources = [ ...@@ -536,9 +536,7 @@ libgl_sources = [
"src/libGL/entry_points_gl_4_6_autogen.h", "src/libGL/entry_points_gl_4_6_autogen.h",
"src/libGL/entry_points_wgl.cpp", "src/libGL/entry_points_wgl.cpp",
"src/libGL/entry_points_wgl.h", "src/libGL/entry_points_wgl.h",
"src/libGL/libGL.rc",
"src/libGL/libGL_autogen.cpp", "src/libGL/libGL_autogen.cpp",
"src/libGL/libGL_autogen.def",
"src/libGL/proc_table_wgl.h", "src/libGL/proc_table_wgl.h",
"src/libGL/proc_table_wgl_autogen.cpp", "src/libGL/proc_table_wgl_autogen.cpp",
"src/libGLESv2/global_state.cpp", "src/libGLESv2/global_state.cpp",
...@@ -546,6 +544,13 @@ libgl_sources = [ ...@@ -546,6 +544,13 @@ libgl_sources = [
"src/libGLESv2/resource.h", "src/libGLESv2/resource.h",
] ]
if (is_win) {
libgl_sources += [
"src/libGL/libGL.rc",
"src/libGL/libGL_autogen.def",
]
}
libglesv2_sources = [ libglesv2_sources = [
"src/common/angleutils.h", "src/common/angleutils.h",
"src/common/debug.h", "src/common/debug.h",
...@@ -569,24 +574,33 @@ libglesv2_sources = [ ...@@ -569,24 +574,33 @@ libglesv2_sources = [
"src/libGLESv2/entry_points_gles_ext_autogen.h", "src/libGLESv2/entry_points_gles_ext_autogen.h",
"src/libGLESv2/global_state.cpp", "src/libGLESv2/global_state.cpp",
"src/libGLESv2/global_state.h", "src/libGLESv2/global_state.h",
"src/libGLESv2/libGLESv2.rc",
"src/libGLESv2/libGLESv2_autogen.cpp", "src/libGLESv2/libGLESv2_autogen.cpp",
"src/libGLESv2/proc_table_egl.h", "src/libGLESv2/proc_table_egl.h",
"src/libGLESv2/proc_table_egl_autogen.cpp", "src/libGLESv2/proc_table_egl_autogen.cpp",
"src/libGLESv2/resource.h", "src/libGLESv2/resource.h",
] ]
if (is_win) {
libglesv2_sources += [ "src/libGLESv2/libGLESv2.rc" ]
}
libglesv1_cm_sources = [ libglesv1_cm_sources = [
"src/libGLESv1_CM/libGLESv1_CM.cpp", "src/libGLESv1_CM/libGLESv1_CM.cpp",
"src/libGLESv1_CM/libGLESv1_CM.rc",
"src/libGLESv1_CM/resource.h", "src/libGLESv1_CM/resource.h",
] ]
if (is_win) {
libglesv1_cm_sources += [ "src/libGLESv1_CM/libGLESv1_CM.rc" ]
}
libegl_sources = [ libegl_sources = [
"src/libEGL/egl_loader_autogen.h", "src/libEGL/egl_loader_autogen.h",
"src/libEGL/libEGL.cpp", "src/libEGL/libEGL.cpp",
"src/libEGL/libEGL.rc",
"src/libEGL/resource.h", "src/libEGL/resource.h",
"src/libGLESv2/entry_points_egl.h", "src/libGLESv2/entry_points_egl.h",
"src/libGLESv2/entry_points_egl_ext.h", "src/libGLESv2/entry_points_egl_ext.h",
] ]
if (is_win) {
libegl_sources += [ "src/libEGL/libEGL.rc" ]
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment